David Sehr
f8b6855dca
Merge "Merge "Installer connection support for dump_profiles" into nyc-dev am: 7c5bcfc21a am: fc536cb862" into nyc-mr1-dev-plus-aosp
...
am: ad63ea9962
* commit 'ad63ea9962f300a1a660c4b565c29357460d678a':
Installer connection support for dump_profiles
Change-Id: Ia332553255b7ca91e6d53e819a04ce90d0e669a7
2016-06-02 00:30:22 +00:00
David Sehr
4fa0e17183
Merge "Installer connection support for dump_profiles" into nyc-dev am: 7c5bcfc21a
...
am: fc536cb862
* commit 'fc536cb862c67d91eaa7fa94557cdc2f0f415678':
Installer connection support for dump_profiles
Change-Id: I6f8dbd362f6accc2d90409b91e96efed531820d9
2016-06-01 23:15:53 +00:00
David Sehr
fc536cb862
Merge "Installer connection support for dump_profiles" into nyc-dev
...
am: 7c5bcfc21a
* commit '7c5bcfc21ac87c56c57b1929ce04481fa0e116c7':
Installer connection support for dump_profiles
Change-Id: I4085587ad80b04bc99efbe51c4480f193186a872
2016-06-01 23:04:25 +00:00
David Sehr
7c5bcfc21a
Merge "Installer connection support for dump_profiles" into nyc-dev
2016-06-01 22:16:05 +00:00
David Sehr
a877708286
Installer connection support for dump_profiles
...
Bug: 28748264
Change-Id: I22322b5a0716a030d9873edcc6dfd7f3ef2d3bca
2016-06-01 08:21:27 -07:00
Chris Banes
9d2f3d885f
Fix action mode animation on recreations - framework edition am: e65b3fbb63 am: b4acd653e6
...
am: 63aa97a5b6
* commit '63aa97a5b6470634b939d6d6e481b6b2554049d7':
Fix action mode animation on recreations - framework edition
Change-Id: I6ee5eef6630e1cd73cec8e8dd0f75898131632af
2016-06-01 14:06:11 +00:00
Chris Banes
63aa97a5b6
Fix action mode animation on recreations - framework edition am: e65b3fbb63
...
am: b4acd653e6
* commit 'b4acd653e6f554d33b838b3dd1de643d7997956d':
Fix action mode animation on recreations - framework edition
Change-Id: I90681c1028df89dc10f7e79068b5936685bdf83c
2016-06-01 13:58:25 +00:00
Chris Banes
9269e2272b
Fix action mode animation on recreations - framework edition
...
am: e65b3fbb63
* commit 'e65b3fbb63b4b6937fede2e4b889c0a51a881358':
Fix action mode animation on recreations - framework edition
Change-Id: Ic990cf5fdb98e86083ccfe54f8f3e6905aa3e375
2016-06-01 13:54:01 +00:00
Chris Banes
b4acd653e6
Fix action mode animation on recreations - framework edition
...
am: e65b3fbb63
* commit 'e65b3fbb63b4b6937fede2e4b889c0a51a881358':
Fix action mode animation on recreations - framework edition
Change-Id: I19274b7ede1fae09deb915807c35a478caf939ee
2016-06-01 13:53:58 +00:00
Chris Banes
e65b3fbb63
Fix action mode animation on recreations - framework edition
...
Currently if an action mode is started in onCreate()
it will fade in. This isn't ideal though, especially
since Activities are recreated routinely with
multi-window and resizable Activities. In that instance
we fade it in on every recreate.
This CL fixes this in both the decor and toolbar action
modes to only fade in if the decor has been laid out.
BUG: 29036694
Change-Id: Iae985efcced170a0a4229124c1c132355c2aa71e
2016-06-01 14:38:17 +01:00
Roshan Pius
7bc7be2381
Merge "XmlUtils: Add missing readThisByteArrayXml method"
2016-06-01 00:14:23 +00:00
Jorim Jaggi
88958c599d
Merge "Enforce background fallback to be non-translucent" into nyc-dev am: a35724f666 am: b5952d22f0
...
am: ecc9e7981a
* commit 'ecc9e7981a81332ad180ab08c47c97d451adf523':
Enforce background fallback to be non-translucent
Change-Id: I6938706512c50333b2d16be7bdec4d6807227e26
2016-05-31 23:17:54 +00:00
Jorim Jaggi
ecc9e7981a
Merge "Enforce background fallback to be non-translucent" into nyc-dev am: a35724f666
...
am: b5952d22f0
* commit 'b5952d22f098e43f97be2c6cbb3b45dddc58b81f':
Enforce background fallback to be non-translucent
Change-Id: I6945d24fefb2ba3cec1cff21ef9226668f707536
2016-05-31 23:12:24 +00:00
Jorim Jaggi
cc8707ca9a
Merge "Enforce background fallback to be non-translucent" into nyc-dev
...
am: a35724f666
* commit 'a35724f6667e80abc5e6b45e75d7000d3fb17267':
Enforce background fallback to be non-translucent
Change-Id: I692f30718453e03570e1512adb3b6e9fbe787197
2016-05-31 23:02:53 +00:00
Jorim Jaggi
b5952d22f0
Merge "Enforce background fallback to be non-translucent" into nyc-dev
...
am: a35724f666
* commit 'a35724f6667e80abc5e6b45e75d7000d3fb17267':
Enforce background fallback to be non-translucent
Change-Id: If68ead500309566e66230b079f71667e0d555be0
2016-05-31 23:02:23 +00:00
Roshan Pius
651209b597
XmlUtils: Add missing readThisByteArrayXml method
...
Add the missing XML to byte array conversion method.
While there,
1. Fix writeByteArrayXml method to store the hex chars of the value.
2. Cleanup couple of error strings in |readThisIntArrayXml| method.
BUG: 29039296
Change-Id: I6386f7df7c5c8b7bc3bc5a268196da617209cea9
TEST: Compiles & manual testing.
2016-05-31 13:36:32 -07:00
Jorim Jaggi
8e879f1fec
Enforce background fallback to be non-translucent
...
To avoid screen garbage or wallpaper shining through, the background
we use there for filling the whole needs to
a) Be non-translucent in all cases except if the window is translucent.
b) Don't infer it from the theme as it might be unexpected. Don't define
it in the theme, and use black if it's not defined.
Bug: 28763785
Change-Id: Ifb724b5c5feea3ed70d68e5bd7615fa91185e743
2016-05-31 20:05:37 +00:00
Alan Viverette
80bf1f8a3c
Remove framework dependencies on Support* demos
...
Change-Id: I5b3ba0e7a17ee5ccd93e97b3bd9c519cb8641d97
2016-05-31 14:00:45 -04:00
Ian Rogers
4230c1677f
Merge "Fix SuppressWarnings typo."
2016-05-31 13:55:15 +00:00
Roozbeh Pournader
08b6d01ccb
Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev
...
am: fe524c0e24
* commit 'fe524c0e24ba2dc65c9ea490b2334a039c1b0a6a':
Support ellipsizing LocaleHelper.getDisplayLocaleList()
Change-Id: I98301daa256ab8e8dc2dc05c1e877f39ef685c23
2016-05-31 04:49:59 +00:00
Roozbeh Pournader
a0b920f4da
Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev am: fe524c0e24 am: 5f55e2c43d
...
am: bbed32a63b
* commit 'bbed32a63b420126850767ae5cf2484bea11c1d4':
Support ellipsizing LocaleHelper.getDisplayLocaleList()
Change-Id: Ibead4334a7797320d6ae7c5792482416b4a7e2d0
2016-05-31 01:32:39 +00:00
Roozbeh Pournader
bbed32a63b
Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev am: fe524c0e24
...
am: 5f55e2c43d
* commit '5f55e2c43d8fa1f8b494a5457106435b519bb8c4':
Support ellipsizing LocaleHelper.getDisplayLocaleList()
Change-Id: Icadb45317257e80e97c4dad6970310f64abb1f0b
2016-05-31 01:26:35 +00:00
Roozbeh Pournader
5f55e2c43d
Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev
...
am: fe524c0e24
* commit 'fe524c0e24ba2dc65c9ea490b2334a039c1b0a6a':
Support ellipsizing LocaleHelper.getDisplayLocaleList()
Change-Id: Ifc5d3f3b43bef256141db089d5783427561e4dae
2016-05-31 01:20:44 +00:00
Roozbeh Pournader
fe524c0e24
Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev
2016-05-31 01:02:42 +00:00
Adam Lesinski
ddacd0f779
Merge "Merge "Fix issue where max idle time > total idle time" into nyc-dev am: 89046edb4d am: fc7c27b215" into nyc-mr1-dev-plus-aosp
...
am: 0c67994e33
* commit '0c67994e33f0c5ae471a83129cf8b7ec9eb54ef7':
Fix issue where max idle time > total idle time
Change-Id: Ia9cf5c89afc542f14ac3ca664e8a2baa0f3d1218
2016-05-27 22:13:57 +00:00
Ian Rogers
a7f834f1ce
Fix SuppressWarnings typo.
...
As Error Prone states:
Suppressing "deprecated" is probably a typo for "deprecation"
Bug: 27723540
Change-Id: Iedc8ef3b876f5238cc0e2d89d57138eafd5bf91f
2016-05-27 14:31:19 -07:00
The Android Automerger
6f2f02e4ae
Merge commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611'
...
* commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611':
docs: Refinements for testing
Fix toast with accessibility and app pinning
Updated link to material design page.
Change overdraw test to use windowbackground
Prevent callbacks during DrawableContainer child initialization
Fixing crash in SysUI due to invalid group.
Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.
Fix Activity Transition mess-up.
Time to #NameAndroidN!
Prevent use of a null sCallbackObj by Hardware FLP
Fixed the relative time spoken with accessibility
Use backstop timeouts on asynchronous countdown during preflight
2016-05-27 20:05:56 +00:00
Roozbeh Pournader
0ad4dccf88
Support ellipsizing LocaleHelper.getDisplayLocaleList()
...
Add an extra parameter to LocaleHelper.getDisplayLocaleList()
specifying the maximum number of locales to output, as callers
probably won't need the whole list.
Bug: 28872122
Change-Id: Ief136bc1af2841e76ed4d8e65932a9a30821eae3
2016-05-27 06:46:26 +00:00
Adam Lesinski
408002879c
Merge "Fix issue where max idle time > total idle time" into nyc-dev am: 89046edb4d
...
am: fc7c27b215
* commit 'fc7c27b21596fbc379d08add355b90893d9a0e25':
Fix issue where max idle time > total idle time
Change-Id: Ie247488ca42fbd3c214a7c493ac17dea74c9dde4
2016-05-27 03:54:15 +00:00
Adam Lesinski
fc7c27b215
Merge "Fix issue where max idle time > total idle time" into nyc-dev
...
am: 89046edb4d
* commit '89046edb4d64fe1c7662103cce3a82b69e05cfe4':
Fix issue where max idle time > total idle time
Change-Id: I22908fb8f1c8ee7325687cebf646c3a03f6e1ea7
2016-05-27 03:34:58 +00:00
Jeff Sharkey
977450135c
Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am: d6ee899397" into nyc-mr1-dev
...
am: 56f7a36c46
* commit '56f7a36c46678f596f870fbef41252eedc812150':
Time to #NameAndroidN!
Change-Id: Iec0ae063378200965d8a153308afac4edcfc9a8d
2016-05-27 03:28:50 +00:00
Dan Sandler
f64660d551
Merge "Time to #NameAndroidN!" into nyc-dev
...
am: 45caebe035
* commit '45caebe035a67db18d06c4f4e4f124246fb5321d':
Time to #NameAndroidN!
Change-Id: Iecedefbae64d4a6ffb67971be0f9da5eb746b1ed
2016-05-27 03:12:50 +00:00
Adam Lesinski
7e762beb7f
Merge "Fix issue where max idle time > total idle time" into nyc-dev
...
am: 89046edb4d
* commit '89046edb4d64fe1c7662103cce3a82b69e05cfe4':
Fix issue where max idle time > total idle time
Change-Id: Idfbfa60ec62002712073ae9af3c3e4c0e39be1e7
2016-05-27 01:52:32 +00:00
Adam Lesinski
89046edb4d
Merge "Fix issue where max idle time > total idle time" into nyc-dev
2016-05-27 01:44:32 +00:00
Adam Lesinski
8ce3694181
Fix issue where max idle time > total idle time
...
If the batterystats were reset while the device was
idling (via command line most likely), then also reset the
last time the device started idling so that the max idle time
calculation is correct.
Bug:28452600
Change-Id: I8a3d5dc3081deda76356c03d891e098baa85f88a
2016-05-26 16:05:35 -07:00
Dan Sandler
82aba559fa
Merge "Time to #NameAndroidN!" into nyc-dev
...
am: 45caebe035
* commit '45caebe035a67db18d06c4f4e4f124246fb5321d':
Time to #NameAndroidN!
Change-Id: I12f2fd8c169059cb454e8a8d63e1a0110321aaf6
2016-05-26 20:14:40 +00:00
Daniel Sandler
45caebe035
Merge "Time to #NameAndroidN!" into nyc-dev
2016-05-26 20:07:09 +00:00
Dan Sandler
1b1edde9ee
Time to #NameAndroidN!
...
Bug: 27376882
Change-Id: I32397e634039a64b86669662908fab2effb367a7
2016-05-26 12:47:25 -04:00
Ricky Wai
f7a58e292c
Merge "Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4 am: 754ddca748" into nyc-mr1-dev-plus-aosp
...
am: 1db5fc9810
* commit '1db5fc9810c412aafcfe430285943c6797e8e3fc':
Add resetKeyStore() in LockSettingsService
Change-Id: Ia3a5c7156fd7774bffa8e4b5ad4d81b36e408923
2016-05-26 14:51:20 +00:00
Ricky Wai
e1855ce492
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4
...
am: 754ddca748
* commit '754ddca748d7a8d3e55f4d90c07ca140a7ed312d':
Add resetKeyStore() in LockSettingsService
Change-Id: Ic5d0e880c85754a4c198597c80c7eacfa1b1516a
2016-05-26 14:35:30 +00:00
Ricky Wai
754ddca748
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev
...
am: 1cb6f9d8a4
* commit '1cb6f9d8a4827d50e26bf83068a928e47c5c1f1e':
Add resetKeyStore() in LockSettingsService
Change-Id: I6af43eb9f472c1d5a1f9356a9b618a183200e38e
2016-05-26 14:03:51 +00:00
Ricky Wai
9b22e5b4e8
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev
...
am: 1cb6f9d8a4
* commit '1cb6f9d8a4827d50e26bf83068a928e47c5c1f1e':
Add resetKeyStore() in LockSettingsService
Change-Id: I0125a334fac098183e68fa0b9cd24bda64a88fae
2016-05-26 14:03:51 +00:00
Ricky Wai
1cb6f9d8a4
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev
2016-05-26 13:46:26 +00:00
Phil Weaver
1f68154716
Merge "Improve accessibility window title behavior" into nyc-dev am: 7ab1a4d286 am: 0a16a8d1d6
...
am: f6a1e1fe05
* commit 'f6a1e1fe05885cfa2f5aebf9102bcac7daa4bcfa':
Improve accessibility window title behavior
Change-Id: Icc64e6cfe827e93c5b5be11c8244e681c037d952
2016-05-26 00:48:40 +00:00
Phil Weaver
f6a1e1fe05
Merge "Improve accessibility window title behavior" into nyc-dev am: 7ab1a4d286
...
am: 0a16a8d1d6
* commit '0a16a8d1d6ee63519123857dc4f305c96de7198b':
Improve accessibility window title behavior
Change-Id: I0b0f95fb78e342cd17a85c7077f6e13a44ed0045
2016-05-26 00:24:59 +00:00
Phil Weaver
0a16a8d1d6
Merge "Improve accessibility window title behavior" into nyc-dev
...
am: 7ab1a4d286
* commit '7ab1a4d286898acffd1f3b444f9efc9e1d2a104e':
Improve accessibility window title behavior
Change-Id: Iff0d61871f48a66510e1fab72adbfb062c01c203
2016-05-26 00:19:19 +00:00
Phil Weaver
062d24f9ec
Merge "Improve accessibility window title behavior" into nyc-dev
...
am: 7ab1a4d286
* commit '7ab1a4d286898acffd1f3b444f9efc9e1d2a104e':
Improve accessibility window title behavior
Change-Id: I29286da845751351f3dcf603efb12441a6efe74e
2016-05-26 00:18:34 +00:00
Sunny Goyal
9a82574d0b
Merge "Maintaining diff for all widget operations instead of just the Views update" into nyc-mr1-dev am: 6f84a27a75
...
am: 2034a76a6e
* commit '2034a76a6e0d00d1e72ebae4c0fdd0feb5b345bd':
Maintaining diff for all widget operations instead of just the Views update
Change-Id: I7df336ac8079b42dbe34be0e970aa6c9ced99da9
2016-05-25 21:06:31 +00:00
Sunny Goyal
2034a76a6e
Merge "Maintaining diff for all widget operations instead of just the Views update" into nyc-mr1-dev
...
am: 6f84a27a75
* commit '6f84a27a7597a3bc34316baf2af2bda30a2d75de':
Maintaining diff for all widget operations instead of just the Views update
Change-Id: Iae3f2a6fc040d4484788ba203e0e0b6a66ed5c48
2016-05-25 20:54:11 +00:00
Sunny Goyal
6f84a27a75
Merge "Maintaining diff for all widget operations instead of just the Views update" into nyc-mr1-dev
2016-05-25 20:45:44 +00:00