Commit Graph

59226 Commits

Author SHA1 Message Date
Andreas Gampe
74755c9eb5 resolve merge conflicts of 7983723 to master
Change-Id: I1e903d23598c8066b9103499287a7ee04d33c75a
2016-04-20 15:11:43 -07:00
Trevor Johns
0392182bff Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev am: 59c9a93 am: 254f1b8
am: e1b5670

* commit 'e1b56701fd219227adae615fe81f03d5db4ae433':
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev

Change-Id: I8cf43f9ad491c6f23eb5fe0051293267ab2d03bf
2016-04-20 21:32:39 +00:00
Robert Carr
2bce1a2585 Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev am: 5a2554a am: bf2a2fa
am: ae3539f

* commit 'ae3539f055b01cda145ed0f8f826c60865964648':
  Respect WRAP_CONTENT when resolving drop down position.

Change-Id: I5c4752f51747d08bfdfb4530e6ed3e32b99dd90c
2016-04-20 21:32:13 +00:00
Felipe Leme
b756f6ed34 Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev am: 9724fba am: 0627850
am: 9acf151

* commit '9acf1516eb00827464fce1ab6c893de9721081e4':
  Added onRestrictBackgroundWhitelistChanged callback.

Change-Id: Iae1c0af0aec6dba501249c0db08ade5a36f99607
2016-04-20 21:29:18 +00:00
Andreas Gampe
798372384e Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev am: 58f2072
am: 6ce2774

* commit '6ce27741799f0059e343cde5e0fbef9073c60ee8':
  Frameworks/base: Add holder to BaseBundle

Change-Id: Ia4053ed3e376a08dbe8f1273d86c3ebdb2cca388
2016-04-20 21:15:26 +00:00
Trevor Johns
e1b56701fd Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev am: 59c9a93
am: 254f1b8

* commit '254f1b8a43480749b7061129289d34bc15d345a5':
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev

Change-Id: I32a3081af9ca5533785c90b7239ffd5b5e69d5bf
2016-04-20 21:15:11 +00:00
Rob Carr
ae3539f055 Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev am: 5a2554a
am: bf2a2fa

* commit 'bf2a2fafaf7659352dbc36de507e52dceceecaad':
  Respect WRAP_CONTENT when resolving drop down position.

Change-Id: I82ab0dcef53f34ba5275826e47a724842bd6cdd8
2016-04-20 21:14:41 +00:00
TreeHugger Robot
9acf1516eb Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev am: 9724fba
am: 0627850

* commit '0627850430ba3dad041891de570e0d08e22c13d2':
  Added onRestrictBackgroundWhitelistChanged callback.

Change-Id: I278f8b4f8e29ea69b15e7bef9556c0ed0a81c82b
2016-04-20 21:11:50 +00:00
Andreas Gampe
58f20726e9 Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev 2016-04-20 18:58:32 +00:00
Trevor Johns
59c9a93fc2 Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev
* changes:
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev
2016-04-20 18:35:57 +00:00
Rob Carr
5a2554a854 Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev 2016-04-20 18:30:16 +00:00
TreeHugger Robot
9724fba835 Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev 2016-04-20 17:44:56 +00:00
Philip P. Moltmann
24fdc17792 Merge "Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory." into nyc-dev am: a1a1aa3 am: b8ccfaa4
am: 7a1ae0b

* commit '7a1ae0bce2b86ee881ed0fe0bc25cdaa54922c16':
  Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory.

Change-Id: Iaefe74d98b308d9ed676b47dfcc96222ec476ab8
2016-04-20 15:13:02 +00:00
Philip P. Moltmann
b8ccfaa4ff Merge "Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory." into nyc-dev
am: a1a1aa3

* commit 'a1a1aa3c682215f0ac7251c43f77985b9aced2a2':
  Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory.

Change-Id: I6a177370c3fdcf0d81eedc3bc383f389f058b06a
2016-04-20 15:06:47 +00:00
Philip P. Moltmann
a1a1aa3c68 Merge "Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory." into nyc-dev 2016-04-20 15:01:05 +00:00
Rubin Xu
7f55d526f1 Merge "Kill foreground apps when turning off work" into nyc-dev am: 49425d6 am: 48cef81
am: 512ab59

* commit '512ab599fc903da21b67c0c4d01ce9ffb8e6d68f':
  Kill foreground apps when turning off work

Change-Id: I83e0e9792225416c6a0c9de4a8201dcb2e37666f
2016-04-20 09:46:31 +00:00
Rubin Xu
48cef81f6e Merge "Kill foreground apps when turning off work" into nyc-dev
am: 49425d6

* commit '49425d612cee3864a316e9ecb6ec3faeae519b1e':
  Kill foreground apps when turning off work

Change-Id: Ie8ea1ec98232437623c83f7d32c1f05c47580b35
2016-04-20 09:40:38 +00:00
Rubin Xu
49425d612c Merge "Kill foreground apps when turning off work" into nyc-dev 2016-04-20 09:33:52 +00:00
Jakub Pawlowski
6a5cb51b5e Merge "OobData documentation" into nyc-dev am: 75760e6 am: a08c14d
am: c97b0a7

* commit 'c97b0a734ddf093cbaf2e5fb7db2615c46d31dc5':
  OobData documentation

Change-Id: I0fa5e83a5a920d93fcc156e6ba308f9a05968db3
2016-04-20 05:26:47 +00:00
Jakub Pawlowski
c97b0a734d Merge "OobData documentation" into nyc-dev am: 75760e6
am: a08c14d

* commit 'a08c14d05c47f1818dcb83c63143fcfb37044dd6':
  OobData documentation

Change-Id: I6a045e0fd21bf3293cc8a1cd474be231109db009
2016-04-20 05:20:51 +00:00
Andreas Gampe
52764cba59 Frameworks/base: Add holder to BaseBundle
Move EMPTY_PARCEL into an inner holder class. Add holder to
preloaded-classes. Clean up dependencies.

Allows to compile-time initialize:
* android.os.BaseBundle
* android.os.Bundle
* android.os.PersistableBundle
* android.telephony.CarrierConfigManager

Bug: 27265238
Change-Id: Ib8017aa419c2985963b3c68a8046462a38652ef2
2016-04-19 20:46:43 -07:00
Jakub Pawlowski
68852d1776 Merge "OobData documentation" into nyc-dev
am: 75760e6

* commit '75760e6b62e46fc9abcde523878459b08558f9d1':
  OobData documentation

Change-Id: Ief21f781808b84c5c2f63eade310b90209d1cd83
2016-04-20 03:20:15 +00:00
Jakub Pawlowski
75760e6b62 Merge "OobData documentation" into nyc-dev 2016-04-20 03:15:23 +00:00
Robert Carr
2665604edd Respect WRAP_CONTENT when resolving drop down position.
We recently added the width/height <0 check to prevent
passing unresolved widths in to tryFitVertical or
tryFitHorizontal and produce strange behaviors. This made
more sense than the code before it but still not that much
sense. We need to treat MATCH_PARENT and WRAP_CONTENT differently
as the documentation suggests.

Bug: 28267951
Change-Id: I6f2f248c8d1f63d31bdd75c24f7250c28381c712
2016-04-19 19:10:44 -07:00
Jorim Jaggi
9b23400b05 Merge "Fixes for resize thread" into nyc-dev am: 13219992a0 am: 47606dc20f
am: b3150d580e

* commit 'b3150d580e869fe85e3aec1b6417a9161acc7400':
  Fixes for resize thread

Change-Id: I6c9d9151edd94b18792875cd25f70f816053e326
2016-04-20 00:18:57 +00:00
Jorim Jaggi
b3150d580e Merge "Fixes for resize thread" into nyc-dev am: 13219992a0
am: 47606dc20f

* commit '47606dc20fb12e6fcf9c889d48b1b78b6790561e':
  Fixes for resize thread

Change-Id: I683fcd212936beb48808d016f8cf87a8c5635925
2016-04-20 00:16:45 +00:00
Jorim Jaggi
4ed3f1dd1c Merge "Fixes for resize thread" into nyc-dev
am: 13219992a0

* commit '13219992a0e8b08195ffd596d40d9ceecbf741e0':
  Fixes for resize thread

Change-Id: I2efa14b883a2d9ad31b6e2c4fd72a2b2258adf69
2016-04-20 00:14:31 +00:00
Jorim Jaggi
13219992a0 Merge "Fixes for resize thread" into nyc-dev 2016-04-20 00:07:54 +00:00
Doris Liu
6e09efdb3f Merge "Merge "Fix pause/resume for AnimatorSet" into nyc-dev am: dd67b0d am: 86ac81b" into nyc-mr1-dev-plus-aosp
am: 36b3ef5

* commit '36b3ef56ee20be40a4b1a66beac2f1cb15151ac3':
  Fix pause/resume for AnimatorSet

Change-Id: I42b7ce2033e82f81bbbd07b61f454f86d77514ae
2016-04-19 22:39:30 +00:00
Robert Carr
d51e2981a2 Merge "Force windows to be scalable during pinned animation." into nyc-dev am: 4e9a9df am: 1b72363
am: 465ff1f

* commit '465ff1f9e61953eb57ab2fe3ff3405abebc79628':
  Force windows to be scalable during pinned animation.

Change-Id: I49a8373aad59842e28847f36511e662c7087d4b3
2016-04-19 22:28:20 +00:00
Doris Liu
86ac81b6ba Merge "Fix pause/resume for AnimatorSet" into nyc-dev
am: dd67b0d

* commit 'dd67b0d52521bb828bc31732fe3ac8b786a19cce':
  Fix pause/resume for AnimatorSet

Change-Id: I235c869ce54fdf789898f8663a92fd22a4872600
2016-04-19 22:24:27 +00:00
Robert Carr
1b72363846 Merge "Force windows to be scalable during pinned animation." into nyc-dev
am: 4e9a9df

* commit '4e9a9dfb67ebc48028b1613a03144101d94f7d92':
  Force windows to be scalable during pinned animation.

Change-Id: I772d120442ed82c55c71fbf5ce841735d7a14cc5
2016-04-19 22:17:16 +00:00
Doris Liu
dd67b0d525 Merge "Fix pause/resume for AnimatorSet" into nyc-dev 2016-04-19 22:14:37 +00:00
Rob Carr
4e9a9dfb67 Merge "Force windows to be scalable during pinned animation." into nyc-dev 2016-04-19 22:11:02 +00:00
Kenny Guy
ed4ae966a4 Merge "Add test method to remove admins." into nyc-dev am: 3c5ceae am: 1ac021e
am: 28a12ba

* commit '28a12ba5f6313d489d4b8e3c9dd6b3e06da6624e':
  Add test method to remove admins.

Change-Id: I32d81f5cb92a680f98446a8b735f6d2b0f501f64
2016-04-19 22:00:40 +00:00
Amith Yamasani
28a12ba5f6 Merge "Add test method to remove admins." into nyc-dev am: 3c5ceae
am: 1ac021e

* commit '1ac021e6245f7a9eb2aaf208bbb506541f6dd8ab':
  Add test method to remove admins.

Change-Id: I8f59c19521ea371cf9ef5a29c1dbfa3187a548ee
2016-04-19 21:57:19 +00:00
Kenny Guy
75d4db49d9 Merge "Add test method to remove admins." into nyc-dev
am: 3c5ceae

* commit '3c5ceae1d35de476644e4d5db5978149311e63e6':
  Add test method to remove admins.

Change-Id: Icff7bb03ca1c2bc987d46450a2dd2f49edcfb60b
2016-04-19 21:53:23 +00:00
Amith Yamasani
3c5ceae1d3 Merge "Add test method to remove admins." into nyc-dev 2016-04-19 21:46:41 +00:00
Jorim Jaggi
0d6222d96d Fixes for resize thread
- Make sure to draw navigation bar/status bar background before the
main render node. This is to avoid any flickering when entering
resizing mode, so you rather overdraw than underdraw.
- Draw the first frame from the main thread directly to increase
chance that all drawing commands are processing within a single
frame.

Bug: 27864358
Bug: 28003586
Change-Id: I033f57cdbcb2c16ea93134c041095a415d5c25b4
2016-04-19 14:41:11 -07:00
Philip P. Moltmann
b87c08da82 Expose additional fields needed by PrintRecommendationService GTS test
and move files into properly named directory.

Fixes: 28025769, 28214466
Change-Id: I14737515fc12525a1685a1a222f21913755ac988
2016-04-19 14:31:04 -07:00
Chris Craik
50828c790a Merge "Document startService cost" into nyc-dev am: 6ed4e35 am: 82b735b
am: 90f1a4c

* commit '90f1a4c60792898feaa9c5d52dfc1f59e61eee27':
  Document startService cost

Change-Id: I586cb1a40393dc2e4285492369d7117fda86ba7b
2016-04-19 21:26:36 +00:00
Chris Craik
82b735bfb3 Merge "Document startService cost" into nyc-dev
am: 6ed4e35

* commit '6ed4e35e49fb9d1e485f53b4ce309865d98a6058':
  Document startService cost

Change-Id: Iee9832e83570b01c98b72ce46a500b61b3184036
2016-04-19 21:19:57 +00:00
Joe Onorato
a5d2056f25 Merge "Consolidate the HealthStats UI to only use milliseconds." into nyc-dev am: 4c4afed am: 6ee19e4
am: 67288c5

* commit '67288c5b6f05e18e85dd9a520f273d311952276f':
  Consolidate the HealthStats UI to only use milliseconds.

Change-Id: I8ea14a4502f124daee32c0ef92130200431f04e7
2016-04-19 21:10:42 +00:00
Chris Craik
6ed4e35e49 Merge "Document startService cost" into nyc-dev 2016-04-19 21:08:14 +00:00
Joe Onorato
67288c5b6f Merge "Consolidate the HealthStats UI to only use milliseconds." into nyc-dev am: 4c4afed
am: 6ee19e4

* commit '6ee19e49346eea5d096933611586ab2b9d86e86d':
  Consolidate the HealthStats UI to only use milliseconds.

Change-Id: Idf18eb11cff73c174072b4ab831bc35b5cb467de
2016-04-19 21:06:29 +00:00
Joe Onorato
2d7e674608 Merge "Consolidate the HealthStats UI to only use milliseconds." into nyc-dev
am: 4c4afed

* commit '4c4afedfc5134558c1f674c1fc8f41260e07bdeb':
  Consolidate the HealthStats UI to only use milliseconds.

Change-Id: I875b82483386bce75b35304970b6020d1da2ed5d
2016-04-19 21:00:52 +00:00
Joe Onorato
4c4afedfc5 Merge "Consolidate the HealthStats UI to only use milliseconds." into nyc-dev 2016-04-19 20:49:20 +00:00
Todd Kennedy
62347f17f3 Merge "Always perform has code check" into nyc-dev am: 069ed70 am: 64dc481
am: a0906c8

* commit 'a0906c8d9e36ac79d1f802ec0cf6dd82aa39240c':
  Always perform has code check

Change-Id: I6e1afb2c727cf3944fb65d8b15f49de272bde362
2016-04-19 20:01:00 +00:00
Todd Kennedy
64dc4813c9 Merge "Always perform has code check" into nyc-dev
am: 069ed70

* commit '069ed7003b3de1f87d28413cc2debc9042386d3c':
  Always perform has code check

Change-Id: Ic8b5ac47631bcb26d27b88eceb389616eec02f85
2016-04-19 19:54:20 +00:00
Robert Carr
1ca6a33f36 Force windows to be scalable during pinned animation.
We resize windows at the beginning of the pinned stack
animation when animating to a larger size, and so for some
duration a resize will be pending. We need to force the window
out of SCALING_MODE_FREEZE so we can animate during this period.

Bug: 27891386
Change-Id: I5cff599ed67f2c179e938662b6f0d99bd790aaba
2016-04-19 12:47:18 -07:00