Commit Graph

63883 Commits

Author SHA1 Message Date
Christopher Tate
9e92c03991 Merge "Don\'t back up wallpapers that we\'ve been told not to" into nyc-dev
am: 665189f

* commit '665189f92646d34bf02082120cba3c62aa718770':
  Don't back up wallpapers that we've been told not to

Change-Id: I45d037436e349445f091a7dad5abad4b7421ad8e
2016-04-20 22:13:17 +00:00
Chris Tate
665189f926 Merge "Don't back up wallpapers that we've been told not to" into nyc-dev 2016-04-20 22:10:40 +00:00
Jim Miller
5480783692 Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev
am: 54c4374

* commit '54c4374b4a67fdfbda936e7f4a8a9538e16c3557':
  Fix bug where fingerprint for wrong userId was attempted to be removed.

Change-Id: I9f5db7259dc9af79f57d16577c2a9d5481ad31ba
2016-04-20 21:52:36 +00:00
Christopher Tate
d7faf53605 Don't back up wallpapers that we've been told not to
In addition, now that the full uncropped wallpaper image is being
backed up, we now handle that via the full-data backup path instead
of key/value.  Restore still knows about legacy data that gets
delivered via the older key/value mechanism.

This change also has the effect of removing the size limitations
around wallpaper restore acceptance.  Any size source imagery is
valid, as crop & scale are rerun in a device-appropriate way
after the restore.

Bug 25453848
Bug 25727875

Change-Id: Idc64a2eaab97a8ecc9d2b8ca5dc011f29cab324d
2016-04-20 14:34:07 -07:00
Jim Miller
54c4374b4a Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev 2016-04-20 21:33:15 +00:00
Ruchi Kandoi
4c24df5a31 Merge "Revert "PowerManager: Adds the Sustained performance API."" into nyc-dev
am: 0fea8ad

* commit '0fea8ad44748abd031c2e73cd5e6bce6a086c5f3':
  Revert "PowerManager: Adds the Sustained performance API."

Change-Id: I7a5d0be180f9c224b9ccb2551ab4f0dbf7c9c4e9
2016-04-20 21:14:59 +00:00
Ruchi Kandoi
5e292bf51f Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev
am: a645c97

* commit 'a645c9753ff004e616a6df4a15c9d2e999508d91':
  window: Adds a Sustained Performance Mode window flag.

Change-Id: Ib839ac8cd7dfa0e216de46bb8b343787d230a36c
2016-04-20 21:14:47 +00:00
Ruben Brunk
2fbf2b701e Merge "Add settings for altering VR display behavior." into nyc-dev
am: 6ada702

* commit '6ada702993227233fd362e98de93cc9e798dc75d':
  Add settings for altering VR display behavior.

Change-Id: Iaf8584c47a91b0a49c4075e6d4fcef10afc3ae11
2016-04-20 21:14:42 +00:00
destradaa
9737ba1153 Merge "Add support for multiple callback registration in." into nyc-dev
am: fdb26b9

* commit 'fdb26b90cbbd1db31d2ee1b2c4c38cfcc7d6a46c':
  Add support for multiple callback registration in.

Change-Id: I52d4f7f2bc7d79ebd80759a94c7cdd23ba724144
2016-04-20 21:14:36 +00:00
Andreas Gampe
c17adf62e5 Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev
am: 58f2072

* commit '58f20726e99947a0f2781b5d4be3052be6eb94dd':
  Frameworks/base: Add holder to BaseBundle

Change-Id: I0b177b9a7b3b11e579b8cc62b89e4036908bf237
2016-04-20 21:12:53 +00:00
Trevor Johns
c0d2c43a22 Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev
am: 59c9a93

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

Change-Id: Iddc9419069d8f5d555baf0c1ef4b2f2ebf75c370
2016-04-20 21:12:38 +00:00
Robert Carr
287dfb665a Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev
am: 5a2554a

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

Change-Id: I81a283518d4afca0fb05185af64ce323a6f7c6b3
2016-04-20 21:12:15 +00:00
Felipe Leme
eac7508a54 Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev
am: 9724fba

* commit '9724fba83545fd075cbda62bb13cdc7820c7291a':
  Added onRestrictBackgroundWhitelistChanged callback.

Change-Id: I1ee90168f1cf29a117961ba1e269fbc89c7f443b
2016-04-20 21:10:41 +00:00
Ruchi Kandoi
9c36c02f0e Revert "PowerManager: Adds the Sustained performance API."
This reverts commit 0abc001275.

Bug: 28150358
Change-Id: I99c71b3d6641310a33e898d6fd475d37c79ba9d0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-04-20 20:49:18 +00:00
Ruchi Kandoi
a645c9753f Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev 2016-04-20 20:35:21 +00:00
Jim Miller
8f2aca0ee4 Fix bug where fingerprint for wrong userId was attempted to be removed.
- cleaned up private API to ensure userId is distinct from groupId.
- fixed bug where we were sending the wrong userId when attempting to
- fix warning about wrong fingerId when receiving final id of 0.

Fixes bug 28268635

Change-Id: I9507723c1a763152775f2feff76c16762f23cf2d
2016-04-20 13:34:11 -07:00
Ruben Brunk
6ada702993 Merge "Add settings for altering VR display behavior." into nyc-dev 2016-04-20 19:51:51 +00:00
Daniel Estrada Alva
fdb26b90cb Merge "Add support for multiple callback registration in." into nyc-dev 2016-04-20 19:22:10 +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
Ruchi Kandoi
43e38de253 window: Adds a Sustained Performance Mode window flag.
Adds setSustainedPerformanceMode(boolean) API for applications to set
the mode for a given window. The mode will be disabled automatically when the
window is no longer in focus.

Bug: 28150358
Change-Id: Ibe8bc564eeaaccbcaad5c4f792cda16da931dffd
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-04-20 09:57:11 -07: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
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
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
Adam Lesinski
50e1291340 Merge "Record in progress count when parceling Timer" into nyc-dev
am: 752434a

* commit '752434a0ff54ac30b7701292b66361e64b2ae5a0':
  Record in progress count when parceling Timer

Change-Id: Icc7e8312df00bd22f0e5433e15fc65d2ad705db4
2016-04-20 01:31:46 +00:00
Adam Lesinski
752434a0ff Merge "Record in progress count when parceling Timer" into nyc-dev 2016-04-20 01:22:37 +00:00
destradaa
78cebca720 Add support for multiple callback registration in.
- Allows several callbacks from different processes to register with
  the ContextHub service.
- Add an 'internal' callback that can be used for primary clients.
- Fix issue with parceling NanoApp info

Change-Id: Iec203e8b8bc847cb9274f3f4157d0773984dd87c
2016-04-19 17:45:18 -07:00
Adam Lesinski
98f0d4692c Record in progress count when parceling Timer
The total time is computed before parceling, but the total count is not.

Bug:27747854
Change-Id: If3afdca9605f74d96a54fb9df17f6df761b99e55
2016-04-19 17:21:40 -07: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
Winson
174e1aceb0 Merge changes Ie3125ec8,Ifa149322,Ifa2ed84a into nyc-dev
am: b77d0bcc84

* commit 'b77d0bcc840fbda8372c4042a1f2e83df8e12a83':
  Tweaking accessibility actions for dock divider.
  Ensure that the drag view is not dimmed.
  Disallowing scrim activity from setting TaskDescription.

Change-Id: I535255c12415caf02e30885fb4efc0efd04cdbc6
2016-04-19 23:09:21 +00:00
Winson Chung
b77d0bcc84 Merge changes Ie3125ec8,Ifa149322,Ifa2ed84a into nyc-dev
* changes:
  Tweaking accessibility actions for dock divider.
  Ensure that the drag view is not dimmed.
  Disallowing scrim activity from setting TaskDescription.
2016-04-19 23:01: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
Adrian Roos
30110b80f7 Merge "Fix unprotected StatusBarManagerService calls" into nyc-dev
am: 3dd5948

* commit '3dd59487cc5f01f38e1e5068ce9257a40473baba':
  Fix unprotected StatusBarManagerService calls

Change-Id: I3afc4a7c1ed8e1f73dcd4c4c0c00a3eb40ac3ce1
2016-04-19 22:17:11 +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
Adrian Roos
3dd59487cc Merge "Fix unprotected StatusBarManagerService calls" into nyc-dev 2016-04-19 22:05:44 +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
Winson
ce9630da86 Tweaking accessibility actions for dock divider.
- Adding tl_full/70%/50%/30%/rb_full

Bug: 27724715
Change-Id: Ie3125ec81e6463696cf56640c6b86f9cfcbda945
2016-04-19 14:46:24 -07: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