Adrian Roos
8187b7056d
Merge \"Seascape Navigation Bar View\" into nyc-mr1-dev
...
am: 7d76682bb3
2016-06-09 18:32:21 +00:00
Adrian Roos
7d76682bb3
Merge "Seascape Navigation Bar View" into nyc-mr1-dev
2016-06-09 18:22:22 +00:00
Adam Lesinski
d748cc4d05
Merge \\"Consume the first sample of KernelUidCpuTimeReader\\" into nyc-dev am: e5417a3863
...
am: 4ae9097f69
2016-06-08 22:59:14 +00:00
Adam Lesinski
a78fa63f75
Merge \"Consume the first sample of KernelUidCpuTimeReader\" into nyc-dev
...
am: e5417a3863
2016-06-08 22:55:39 +00:00
Adam Lesinski
4ae9097f69
Merge \"Consume the first sample of KernelUidCpuTimeReader\" into nyc-dev
...
am: e5417a3863
2016-06-08 22:55:33 +00:00
Adam Lesinski
e7f4f0297f
Consume the first sample of KernelUidCpuTimeReader
...
If the system_server crashes, when it starts back up
it will assume that the entries in kernelUidCpuTimeReader
are all fresh and we will end up double counting cpu time
and power.
Bug:29163081
Change-Id: I73e693199c170229af57efd610950e90263ac9bc
2016-06-08 14:19:09 -07:00
Lorenzo Colitti
3feff1367b
Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev
...
am: 3e2bfbd135
2016-06-08 06:39:18 +00:00
TreeHugger Robot
3e2bfbd135
Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev
...
* changes:
Give WakeupMessage the ability to transport an object as well.
Don't treat the lingerExpired broadcast specially.
Add a test for mobile data always on.
Add a FakeSettingsProvider and use it in ConnectivityServiceTest.
2016-06-08 06:35:32 +00:00
Lorenzo Colitti
eab17da588
Give WakeupMessage the ability to transport an object as well.
...
Bug: 23113288
Change-Id: Ic98e3bcb3ea8b0b28a309bd647fb4178311c46a3
2016-06-08 14:11:52 +09:00
Phil Weaver
d06094dd86
Merge \\"Revert \\"Improve accessibility window title behavior\\"\\" into nyc-dev am: fc71309640
...
am: 2c8099110e
2016-06-08 02:27:41 +00:00
Phil Weaver
2c8099110e
Merge \"Revert \"Improve accessibility window title behavior\"\" into nyc-dev
...
am: fc71309640
2016-06-08 02:24:47 +00:00
Phil Weaver
5c32d65e78
Merge \"Revert \"Improve accessibility window title behavior\"\" into nyc-dev
...
am: fc71309640
2016-06-08 02:24:42 +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
a2fe97ffa4
Merge \\"Frameworks/base: Fix FastPrintWriter infinite loop\\" into nyc-dev am: c82a2b5358
...
am: 89b7934905
2016-06-08 00:50:03 +00:00
Andreas Gampe
66c2bfcede
Merge \"Frameworks/base: Fix FastPrintWriter infinite loop\" into nyc-dev
...
am: c82a2b5358
2016-06-08 00:45:35 +00:00
Andreas Gampe
89b7934905
Merge \"Frameworks/base: Fix FastPrintWriter infinite loop\" into nyc-dev
...
am: c82a2b5358
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
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
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
2016-06-08 00:38:25 +00:00
Phil Weaver
266ed9acc3
Revert "Improve accessibility window title behavior"
...
Bug: 29127065
This reverts commit 2a7e4442bf
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
Adrian Roos
85d202b18a
Seascape Navigation Bar View
...
Allow placing navigation bar on the left side aka seascape. Also
deal with fallout from this change in frame calculations, decor view,
and all over SystemUI - notably no changes to the navigation bar view.
Bug: 28823676
Change-Id: I91187a974a10a940787a858e2609f2e9c5bade78
2016-06-02 16:29:10 -07:00
Dianne Hackborn
1d185fbad7
Merge "Work on issue #29042642 : Watchdog going off" into nyc-dev am: 5a6cf3ac9a
...
am: c9aaec43a6#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#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#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
4fa0e17183
Merge "Installer connection support for dump_profiles" into nyc-dev am: 7c5bcfc21a
...
am: fc536cb862
2016-06-01 23:15:53 +00:00
David Sehr
fc536cb862
Merge "Installer connection support for dump_profiles" into nyc-dev
...
am: 7c5bcfc21a
2016-06-01 23:04:25 +00:00
David Sehr
2855609944
Merge "Installer connection support for dump_profiles" into nyc-dev
...
am: 7c5bcfc21a
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
63aa97a5b6
Fix action mode animation on recreations - framework edition am: e65b3fbb63
...
am: b4acd653e6
2016-06-01 13:58:25 +00:00
Chris Banes
9269e2272b
Fix action mode animation on recreations - framework edition
...
am: e65b3fbb63
2016-06-01 13:54:01 +00:00
Chris Banes
b4acd653e6
Fix action mode animation on recreations - framework edition
...
am: e65b3fbb63
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
Jorim Jaggi
ecc9e7981a
Merge "Enforce background fallback to be non-translucent" into nyc-dev am: a35724f666
...
am: b5952d22f0
2016-05-31 23:12:24 +00:00
Jorim Jaggi
cc8707ca9a
Merge "Enforce background fallback to be non-translucent" into nyc-dev
...
am: a35724f666
2016-05-31 23:02:53 +00:00
Jorim Jaggi
b5952d22f0
Merge "Enforce background fallback to be non-translucent" into nyc-dev
...
am: a35724f666
2016-05-31 23:02:23 +00: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
Roozbeh Pournader
08b6d01ccb
Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev
...
am: fe524c0e24
2016-05-31 04:49:59 +00:00
Roozbeh Pournader
bbed32a63b
Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev am: fe524c0e24
...
am: 5f55e2c43d
2016-05-31 01:26:35 +00:00
Roozbeh Pournader
5f55e2c43d
Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev
...
am: fe524c0e24
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
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
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
2016-05-27 03:34:58 +00:00
