Phil Weaver
eba594fa1b
Merge \\\"Revert \\\"Improve accessibility window title behavior\\\"\\\" into nyc-dev am: fc71309640 am: 2c8099110e
...
am: d06094dd86
Change-Id: I9da39b5bbd28592f7babe17f3aff4142e04f2e47
2016-06-08 02:31:16 +00:00
Phil Weaver
d06094dd86
Merge \\"Revert \\"Improve accessibility window title behavior\\"\\" into nyc-dev am: fc71309640
...
am: 2c8099110e
Change-Id: Id615a721b788760b54754355414fe9762d65f0ab
2016-06-08 02:27:41 +00:00
Phil Weaver
2c8099110e
Merge \"Revert \"Improve accessibility window title behavior\"\" into nyc-dev
...
am: fc71309640
Change-Id: Ia2728037f9e610dd49db2bd1a22fd72690bd5340
2016-06-08 02:24:47 +00:00
Phil Weaver
fc71309640
Merge "Revert "Improve accessibility window title behavior"" into nyc-dev
2016-06-08 02:19:34 +00:00
Andreas Gampe
f55d83b537
Merge \\\"Frameworks/base: Fix FastPrintWriter infinite loop\\\" into nyc-dev am: c82a2b5358 am: 89b7934905
...
am: a2fe97ffa4
Change-Id: Ib3aaf7cd081cbd3e4361e9328c880fa59838b0b4
2016-06-08 00:59:44 +00:00
Jim Miller
6164959544
Merge \\\"Move legacy full disk encryption code to Settings.\\\" into nyc-dev am: 4401e24add am: 21c77ed1a8
...
am: b78840f141
Change-Id: Ica8acbcdab5efeacbda301ff0a517ee18881ac55
2016-06-08 00:50:15 +00:00
Andreas Gampe
a2fe97ffa4
Merge \\"Frameworks/base: Fix FastPrintWriter infinite loop\\" into nyc-dev am: c82a2b5358
...
am: 89b7934905
Change-Id: Idaa84ae75512929656f63318db819232f42d91f7
2016-06-08 00:50:03 +00:00
Andreas Gampe
66c2bfcede
Merge \"Frameworks/base: Fix FastPrintWriter infinite loop\" into nyc-dev
...
am: c82a2b5358
Change-Id: I3da283b088e2e0d689ac35d634823497fa2fece1
2016-06-08 00:45:35 +00:00
Andreas Gampe
89b7934905
Merge \"Frameworks/base: Fix FastPrintWriter infinite loop\" into nyc-dev
...
am: c82a2b5358
Change-Id: I9ff1746643acbbf8663b6e1c5fce553e4f803df4
2016-06-08 00:45:34 +00:00
Jim Miller
b78840f141
Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am: 4401e24add
...
am: 21c77ed1a8
Change-Id: I7c561e027b7216686b8d096ac97e6c6c5a633eaf
2016-06-08 00:43:48 +00:00
TreeHugger Robot
c82a2b5358
Merge "Frameworks/base: Fix FastPrintWriter infinite loop" into nyc-dev
2016-06-08 00:39:00 +00:00
Jim Miller
2cf5b73c0a
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
...
am: 4401e24add
Change-Id: Ic10c6505e4583f487a41eb659227b955013949b7
2016-06-08 00:38:31 +00:00
Jim Miller
21c77ed1a8
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
...
am: 4401e24add
Change-Id: Ibe8709900618cc5d9c5ca18a88ca6fce8c552d54
2016-06-08 00:38:25 +00:00
Phil Weaver
266ed9acc3
Revert "Improve accessibility window title behavior"
...
Bug: 29127065
This reverts commit 2a7e4442bf .
Change-Id: Ibc5527cfedd49c685ffd1b8ae59e87ed99c93d39
2016-06-08 00:34:40 +00:00
TreeHugger Robot
4401e24add
Merge "Move legacy full disk encryption code to Settings." into nyc-dev
2016-06-08 00:31:31 +00:00
Andreas Gampe
ce78b9e114
Frameworks/base: Fix FastPrintWriter infinite loop
...
Check for error condition in loop.
Bug: 29123428
Change-Id: I361ed27ecb8f05512d7e17f8045f3d34667d32d8
2016-06-07 16:02:23 -07:00
Jim Miller
525ca53b4f
Move legacy full disk encryption code to Settings.
...
Fixes bug 27617297
Change-Id: I59455cc1fc46949348d2922834724ab40c14f886
2016-06-03 18:39:16 -07:00
Michael Wright
e051f6f1fd
Rename PointerIcon and Pointer Capture APIs
...
This is a response to API council feedback.
Bug: 26830970
Change-Id: I1be541a53e3943d06640169671824f7daea15462
2016-06-04 02:20:21 +01:00
Dianne Hackborn
db8dee7f9e
Merge "Work on issue #29042642 : Watchdog going off" into nyc-dev am: 5a6cf3ac9a am: c9aaec43a6
...
am: 1d185fbad7
* commit '1d185fbad7bbd1139039283b642655b150884108':
Work on issue #29042642 : Watchdog going off
Change-Id: I659acd8ca9d2b1ddd7992d1c079dd968e60befad
2016-06-02 19:03:55 +00:00
Dianne Hackborn
1d185fbad7
Merge "Work on issue #29042642 : Watchdog going off" into nyc-dev am: 5a6cf3ac9a
...
am: c9aaec43a6
* commit 'c9aaec43a6ff487ff19e5fdb1871efb268b0592b':
Work on issue #29042642 : Watchdog going off
Change-Id: I1ddb808137c527967358e8b12fc93063dd153bfd
2016-06-02 18:55:13 +00:00
Dianne Hackborn
340f22fcc6
Merge "Work on issue #29042642 : Watchdog going off" into nyc-dev
...
am: 5a6cf3ac9a
* commit '5a6cf3ac9a3945c2d1f0e5e28ffda9e52124eb15':
Work on issue #29042642 : Watchdog going off
Change-Id: I2a3b120648aef7401bb6d4c2460f868cdc16c1a0
2016-06-02 18:50:24 +00:00
Dianne Hackborn
c9aaec43a6
Merge "Work on issue #29042642 : Watchdog going off" into nyc-dev
...
am: 5a6cf3ac9a
* commit '5a6cf3ac9a3945c2d1f0e5e28ffda9e52124eb15':
Work on issue #29042642 : Watchdog going off
Change-Id: Ic0c08c2ab1c0e7b1cc195928492ab4c0eaef782f
2016-06-02 18:49:29 +00:00
Dianne Hackborn
5a6cf3ac9a
Merge "Work on issue #29042642 : Watchdog going off" into nyc-dev
2016-06-02 18:31:16 +00:00
Dianne Hackborn
9b78db41a0
Work on issue #29042642 : Watchdog going off
...
Have FastPrintWriter note all cases where an exception is
thrown, and stop trying to push more data into the output
stream when this happens.
Change-Id: I51a1eeb26578f02b2a6f45ef7bc2513dfde702a2
2016-06-01 18:19:24 -07:00
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
2855609944
Merge "Installer connection support for dump_profiles" into nyc-dev
...
am: 7c5bcfc21a
* commit '7c5bcfc21ac87c56c57b1929ce04481fa0e116c7':
Installer connection support for dump_profiles
Change-Id: I6cf3d4fe88577ef1d149c3c4b1c3ee7160d9c7e6
2016-06-01 23:03:50 +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