Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
255,060 Commits 3 Branches 0 Tags
bbcc2b39bd561bc49a14fa4656dd14ff234e5689
Commit Graph

255060 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
bbcc2b39bd Merge "Merge "Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27 am: 2ebb73e557" into nyc-dev am: 4465e8d6e6 am: d70568065b" into nyc-mr1-dev-plus-aosp 2016-05-19 17:52:24 +00:00
Android Build Merger (Role)
595732c3a4 Merge "Merge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev am: 7fae7be595 am: 5ac36afb0b" into nyc-mr1-dev-plus-aosp 2016-05-19 17:52:10 +00:00
Kevin Hufnagle
04f9940e7d Merge "Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27 am: 2ebb73e557" into nyc-dev am: 4465e8d6e6 
am: d70568065b

* commit 'd70568065bc059a6ca37c8c1b5cebccec03bfd81':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: Ie27e0d13c2ee7b408d95e9af4b4edf5f1bc073cf
 2016-05-19 17:51:30 +00:00
Andrii Kulian
6a9fe446a1 Merge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev am: 7fae7be595 
am: 5ac36afb0b

* commit '5ac36afb0b47b6d98175505c0fc879863943d879':
  Clear mResizedWhileNotDragResizing flag after reporting

Change-Id: I9241ec06dcd97ad19cc0a2a27687a7bc04e17dd7
 2016-05-19 17:51:20 +00:00
Kevin Hufnagle
9b084d3ab9 Merge "Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a am: 940de083a3 am: 8dc9a826d5 am: 6b077de7d7" into nyc-dev am: 7f3f4b6f30 
am: 8f69021a90

* commit '8f69021a908c9c805d53eefad1c4f2795d43f656':
  docs: Restored references to "Know Your User" resource cards.

Change-Id: Ie88c5a8e60d00f15352d4b3311a8f66718a1566a
 2016-05-19 17:51:04 +00:00
Kevin Hufnagle
6728ad95f3 Merge "Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27 am: 2ebb73e557" into nyc-dev am: 4465e8d6e6 
am: eeaa9df16c

* commit 'eeaa9df16c8d17e657a643dbab9af584e291dc5d':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: Ie0861b22d2a94cec4906ab8917d9d2369ce8a387
 2016-05-19 17:50:59 +00:00
Andrii Kulian
2d334f4d02 Merge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev am: 7fae7be595 
am: 67cae3965b

* commit '67cae3965b5c2435a462f1635bf1aff511853fa0':
  Clear mResizedWhileNotDragResizing flag after reporting

Change-Id: If44c79f8b6b20fe1b1584cb8846da757b3201d89
 2016-05-19 17:50:51 +00:00
Kevin Hufnagle
8f69021a90 Merge "Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a am: 940de083a3 am: 8dc9a826d5 am: 6b077de7d7" into nyc-dev 
am: 7f3f4b6f30

* commit '7f3f4b6f30e9213f07b8a23500ee6c70981ca8d1':
  docs: Restored references to "Know Your User" resource cards.

Change-Id: I5d32152d0fd871ed7569d65644710c1666a3a2e6
 2016-05-19 17:20:06 +00:00
Kevin Hufnagle
d70568065b Merge "Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27 am: 2ebb73e557" into nyc-dev 
am: 4465e8d6e6

* commit '4465e8d6e68e75b0b5c1114447b8cfeea3873b50':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: I3fbddf1dce22e6edaae2ddd037b71657e2d4040e
 2016-05-19 17:20:03 +00:00
Kevin Hufnagle
eeaa9df16c Merge "Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27 am: 2ebb73e557" into nyc-dev 
am: 4465e8d6e6

* commit '4465e8d6e68e75b0b5c1114447b8cfeea3873b50':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: Icde96164ece2cdea09a5444e820c1f11b7a94cc8
 2016-05-19 17:20:00 +00:00
Andrii Kulian
5ac36afb0b Merge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev 
am: 7fae7be595

* commit '7fae7be59514ba6a7fdc10bdb47c9a9fe09d2cef':
  Clear mResizedWhileNotDragResizing flag after reporting

Change-Id: Iab79d8cdb6f1f93bb44cceaaea5a838aee8e1cb0
 2016-05-19 17:19:54 +00:00
Andrii Kulian
67cae3965b Merge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev 
am: 7fae7be595

* commit '7fae7be59514ba6a7fdc10bdb47c9a9fe09d2cef':
  Clear mResizedWhileNotDragResizing flag after reporting

Change-Id: I4a91f9f86e9a8e5fc228b733822561be56ee3a1a
 2016-05-19 17:19:50 +00:00
Android Build Merger (Role)
7f3f4b6f30 Merge "Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a am: 940de083a3 am: 8dc9a826d5 am: 6b077de7d7" into nyc-dev 2016-05-19 17:13:48 +00:00
Android Build Merger (Role)
4465e8d6e6 Merge "Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27 am: 2ebb73e557" into nyc-dev 2016-05-19 17:13:39 +00:00
Kevin Hufnagle
7f97adc223 Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a am: 940de083a3 am: 8dc9a826d5 
am: 6b077de7d7

* commit '6b077de7d7c02f46c3a74430fa1b739d23d8c1c2':
  docs: Restored references to "Know Your User" resource cards.

Change-Id: I7f263ab12836c7f8cf734425dbe10fea3444572e
 2016-05-19 17:13:05 +00:00
Kevin Hufnagle
eedd9bf4b2 Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27 
am: 2ebb73e557

* commit '2ebb73e5572eb400d6202c9a0e3d365e1fde9d7e':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: I43a8431d48244a6807924239eac4c5211ce380b3
 2016-05-19 17:12:51 +00:00
Andrii Kulian
7fae7be595 Merge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev 2016-05-19 17:11:35 +00:00
Kevin Hufnagle
6b077de7d7 Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a am: 940de083a3 
am: 8dc9a826d5

* commit '8dc9a826d5b7d5a9e4e83374430f95a38a7775e3':
  docs: Restored references to "Know Your User" resource cards.

Change-Id: I5e24c5f0cb5d1434dd924e2706d1a26a47b528f8
 2016-05-19 17:05:53 +00:00
Kevin Hufnagle
2ebb73e557 Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec 
am: 2c98879a27

* commit '2c98879a2793b8607eb4539925e9d1fb38d78610':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: I9f254da6427cea0ad4f4edc2fde8e17d679c4017
 2016-05-19 17:05:50 +00:00
Kevin Hufnagle
8dc9a826d5 Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a 
am: 940de083a3

* commit '940de083a3e2ac5176f36d5b8bd6f88f5d1813dd':
  docs: Restored references to "Know Your User" resource cards.

Change-Id: I8f0f13d2b3099d41d9ae31de75728fd9f46283ce
 2016-05-19 16:57:10 +00:00
Kevin Hufnagle
2c98879a27 Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d 
am: 4af01c1aec

* commit '4af01c1aecc8db2fd084822294ad193a72a34fa7':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: I455575a25350b7a0c66b5f8d698d6d0fc51076a5
 2016-05-19 16:57:08 +00:00
Kevin Hufnagle
940de083a3 Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs 
am: dbfd7dd16a

* commit 'dbfd7dd16a383e41f5a59c2b63231e0848563770':
  docs: Restored references to "Know Your User" resource cards.

Change-Id: I7d350d7574396e0216b2b72ed9e1725242c3fb88
 2016-05-19 16:48:54 +00:00
Kevin Hufnagle
4af01c1aec Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs 
am: 8262d9c00d

* commit '8262d9c00d7332e7f013ef1af6ea818a5d248ec5':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: I56f21d12417b7157f749b02e9f3949bdbace5751
 2016-05-19 16:48:51 +00:00
Kevin Hufnagle
dbfd7dd16a Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs 2016-05-19 16:43:41 +00:00
Kevin Hufnagle
8262d9c00d Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs 2016-05-19 16:43:31 +00:00
Android Build Merger (Role)
aad6acaf6d Merge "Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf3a am: ce290a75f2" into nyc-mr1-dev-plus-aosp 2016-05-19 15:24:45 +00:00
Michael Wright
d308e46354 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf3a 
am: ce290a75f2

* commit 'ce290a75f26e3b9c6e2875ba1fcef65020984b7e':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I8df44a8cbc687f81639cb061fb6739a813f0c386
 2016-05-19 15:23:58 +00:00
Michael Wright
5d2ea237d4 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf3a 
am: 1831ca8f04

* commit '1831ca8f04e117a49227e1b3dc0c8ba1dde06cd5':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: Iebfbc1de1bbf2f86e62ed2105c30e89239368b11
 2016-05-19 15:23:45 +00:00
Michael Wright
1831ca8f04 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 
am: a1e0cebf3a

* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I20532a3148a99d4ea91ba7dc050f8669d5f19400
 2016-05-19 15:12:30 +00:00
Michael Wright
ce290a75f2 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 
am: a1e0cebf3a

* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I03543851263b7e9e2f84b179d66d3d269c48bf6c
 2016-05-19 15:12:29 +00:00
TreeHugger Robot
a1e0cebf3a Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 2016-05-19 15:03:36 +00:00
Android Build Merger (Role)
073466ea8a Merge "Merge "Workaround for ignored resizeableActivity param" into nyc-dev am: 005f9a73fb am: ede05733f0" into nyc-mr1-dev-plus-aosp 2016-05-19 08:09:38 +00:00
Andrii Kulian
4578ef4e63 Merge "Workaround for ignored resizeableActivity param" into nyc-dev am: 005f9a73fb 
am: ede05733f0

* commit 'ede05733f0c02f16324b71311397db5e680f607b':
  Workaround for ignored resizeableActivity param

Change-Id: I81ee6a65b44b9f8f099842619d3548fb64c4c403
 2016-05-19 08:09:10 +00:00
Andrii Kulian
e78cbe1770 Merge "Workaround for ignored resizeableActivity param" into nyc-dev am: 005f9a73fb 
am: 6b21f45add

* commit '6b21f45add49cdacaad9e75cbba332fa3b63522c':
  Workaround for ignored resizeableActivity param

Change-Id: Ia8dc3606ff13b1358d657a8280820ed542cb4781
 2016-05-19 08:09:07 +00:00
Andrii Kulian
6b21f45add Merge "Workaround for ignored resizeableActivity param" into nyc-dev 
am: 005f9a73fb

* commit '005f9a73fbecdb8d0d05eb699d0f02d745110495':
  Workaround for ignored resizeableActivity param

Change-Id: Ia524867cac9118b6dbe5c7c210cd1a1753fe53e1
 2016-05-19 08:06:02 +00:00
Andrii Kulian
ede05733f0 Merge "Workaround for ignored resizeableActivity param" into nyc-dev 
am: 005f9a73fb

* commit '005f9a73fbecdb8d0d05eb699d0f02d745110495':
  Workaround for ignored resizeableActivity param

Change-Id: I93844e807cbedc50b26f98916fe3e79e0ef9afa2
 2016-05-19 08:06:02 +00:00
Andrii Kulian
005f9a73fb Merge "Workaround for ignored resizeableActivity param" into nyc-dev 2016-05-19 07:57:20 +00:00
Android Build Merger (Role)
6639e2fc3a Merge "Merge "Fix build breakage caused by redefining attrs" into nyc-dev am: fa020a8094 am: 475ab2be5c" into nyc-mr1-dev-plus-aosp 2016-05-19 07:18:35 +00:00
Andrii Kulian
c6e533e90d Merge "Fix build breakage caused by redefining attrs" into nyc-dev am: fa020a8094 
am: 475ab2be5c

* commit '475ab2be5c5c2f0cf4fd4ce863a98473f7fbbd0a':
  Fix build breakage caused by redefining attrs

Change-Id: I9c6ef99d1bd7b4affeee500dc6a1b0eca1b84b5b
 2016-05-19 07:18:02 +00:00
Andrii Kulian
38e3b3ba91 Merge "Fix build breakage caused by redefining attrs" into nyc-dev am: fa020a8094 
am: 1b9a930ba4

* commit '1b9a930ba4a5884b01b9ebf6b92065a55c689dec':
  Fix build breakage caused by redefining attrs

Change-Id: Iae28ff991e2dc154db009f75da45f7aa25ada5d2
 2016-05-19 07:17:57 +00:00
Andrii Kulian
1b9a930ba4 Merge "Fix build breakage caused by redefining attrs" into nyc-dev 
am: fa020a8094

* commit 'fa020a8094a08b5a26735c33c4ddaadcb51f99fc':
  Fix build breakage caused by redefining attrs

Change-Id: Id3502d67601e6a4348326c7eeb83de39dfd368b6
 2016-05-19 07:15:03 +00:00
Andrii Kulian
475ab2be5c Merge "Fix build breakage caused by redefining attrs" into nyc-dev 
am: fa020a8094

* commit 'fa020a8094a08b5a26735c33c4ddaadcb51f99fc':
  Fix build breakage caused by redefining attrs

Change-Id: I0663ec408eec497c64c35a9c7d6f43e223c3cc22
 2016-05-19 07:15:01 +00:00
TreeHugger Robot
fa020a8094 Merge "Fix build breakage caused by redefining attrs" into nyc-dev 2016-05-19 07:06:50 +00:00
Andrii Kulian
bd17d8c63b Fix build breakage caused by redefining attrs 
minWidth and minHeight were already defined without format specified
and we need to have definition without format also. Otherwise they conflict.

Bug: 28775586
Change-Id: I0602bd70d03bdacfc604d884951a60871159ed92
 2016-05-18 22:35:19 -07:00
Erik Kline
03307df369 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: c21f84dddb 
am: ae53fb4a43

* commit 'ae53fb4a436bcbb7deea668a26d2ba66bb4c5af3':

Change-Id: Id68aa8f81f11042c7583fad42da2063cbb17efe1
 2016-05-19 04:27:24 +00:00
Erik Kline
f99efa7e75 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: c21f84dddb 
am: 8958153ac7

* commit '8958153ac7921349dd8770a33484ca96581277cc':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: I314ceed6380af58fb3f6308dde11f2d29b324c66
 2016-05-19 04:24:16 +00:00
Erik Kline
ae53fb4a43 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev 
am: c21f84dddb

* commit 'c21f84dddbe8144bb3d392b3b91c6df5f48aed42':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: Ic99edb732d532da27c042824e5ca07c4b35ccfa1
 2016-05-19 04:21:17 +00:00
Erik Kline
8958153ac7 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev 
am: c21f84dddb

* commit 'c21f84dddbe8144bb3d392b3b91c6df5f48aed42':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: I10ed64f309794ed7a18e16f22fa75bc63707998c
 2016-05-19 04:21:15 +00:00
Erik Kline
c21f84dddb Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev 2016-05-19 04:12:40 +00:00
Android Build Merger (Role)
8636c71df6 Merge "Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev am: 8cb3b2bb5c am: fcbc43b70a" into nyc-mr1-dev-plus-aosp 2016-05-19 03:55:51 +00:00