Commit Graph

6697 Commits

Author SHA1 Message Date
Adam Lesinski
ea4a9168ac Merge \\\"BatteryStats: Record fine grained battery discharge\\\" into nyc-dev am: 094c40b2cc am: ae903e100f
am: 334d6f35b5

Change-Id: I791fbb20a02713b728314960fffd6e6392854b94
2016-06-10 02:29:26 +00:00
Adam Lesinski
334d6f35b5 Merge \\"BatteryStats: Record fine grained battery discharge\\" into nyc-dev am: 094c40b2cc
am: ae903e100f

Change-Id: Iaff2fa30e7dea1a8c81c9ae63ef4bdaa98d4f901
2016-06-10 02:24:53 +00:00
Adam Lesinski
ae903e100f Merge \"BatteryStats: Record fine grained battery discharge\" into nyc-dev
am: 094c40b2cc

Change-Id: Ia25345a4ae48ad181edb58fd4b5940145ce19107
2016-06-10 02:21:50 +00:00
TreeHugger Robot
094c40b2cc Merge "BatteryStats: Record fine grained battery discharge" into nyc-dev 2016-06-10 02:12:23 +00:00
Adam Lesinski
3ee3f63eb8 BatteryStats: Record fine grained battery discharge
For devices that report battery discharge via a coulomb counter,
record how much of the battery was discharged while the screen
was on/off.

Bug:28743761
Change-Id: Ie2d1708864352029ff466c1fed14fc057e19b93b
2016-06-09 17:37:22 -07:00
Phil Weaver
d388b6f218 Merge \\\"Improve accessibility window title behavior\\\" into nyc-dev am: f8af34365c am: d567ae1b87
am: 4b82db9d9c

Change-Id: I5c4b6947f7645dd9ec660635f4d24d436f2e6ef2
2016-06-10 00:10:48 +00:00
Phil Weaver
4b82db9d9c Merge \\"Improve accessibility window title behavior\\" into nyc-dev am: f8af34365c
am: d567ae1b87

Change-Id: I7ceecfc27a8980dddf18f0aea15799ef816ee0cf
2016-06-09 23:49:20 +00:00
Phil Weaver
e2b3248823 Merge \"Improve accessibility window title behavior\" into nyc-dev
am: f8af34365c

Change-Id: Id9d2de6b82f8e8062c0d66d759440b574b113a02
2016-06-09 23:42:47 +00:00
Doris Liu
7da4903bf9 Merge changes from topic \'VectorDrawable polishing cherrypicks from master\' into nyc-mr1-dev
am: ea06280b3e

Change-Id: I8d5a26b50f6737964047d06e5e27abbdc4ba6381
2016-06-09 23:42:16 +00:00
Phil Weaver
d567ae1b87 Merge \"Improve accessibility window title behavior\" into nyc-dev
am: f8af34365c

Change-Id: I620cb3dc270a8ad409ec1760cedd778821fd8d98
2016-06-09 23:41:45 +00:00
Doris Liu
c9493879d7 Support Keyframe definition for AVD on RT
BUG: 27441613
Change-Id: Iece386f65f3704d1b7caa2b3690a8d3048ccf6e2
2016-06-09 14:40:32 -07:00
Phil Weaver
155edc693e Improve accessibility window title behavior
Un-reverts ag/1057448, but uses a version of Resources#getText
that returns null rather than throw an exception when no title
is available. This is the same call made before, so this change
should be safer.

Bug: 28744278
Change-Id: I8c123f4f6d74f796ab9e8ffcf955aaf881770da1
2016-06-09 13:45:46 -07:00
Adrian Roos
2cfedbbe53 Merge \\"Seascape Navigation Bar View\\" into nyc-mr1-dev am: 7d76682bb3
am: 8187b7056d

Change-Id: I3db4375855ac1081ea8e59411bf355f4b08150e0
2016-06-09 18:40:26 +00:00
Adrian Roos
8187b7056d Merge \"Seascape Navigation Bar View\" into nyc-mr1-dev
am: 7d76682bb3

Change-Id: Ifc18745df593f07e6b3f04a296d8bd3003a5cb88
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
Doris Liu
7e1d493267 Merge "Support Keyframe definition for AVD on RT" 2016-06-09 00:05:41 +00:00
Adam Lesinski
5014eb50b2 Merge \\\"Consume the first sample of KernelUidCpuTimeReader\\\" into nyc-dev am: e5417a3863 am: 4ae9097f69
am: d748cc4d05

Change-Id: I17572fc8015f8b6f3d9f8c77d35a1c5d117507b0
2016-06-08 23:01:57 +00:00
Adam Lesinski
d748cc4d05 Merge \\"Consume the first sample of KernelUidCpuTimeReader\\" into nyc-dev am: e5417a3863
am: 4ae9097f69

Change-Id: Id3ae13a5bbb55c3c9e749f87eb2f74d9600ef0f4
2016-06-08 22:59:14 +00:00
Adam Lesinski
a78fa63f75 Merge \"Consume the first sample of KernelUidCpuTimeReader\" into nyc-dev
am: e5417a3863

Change-Id: I6188a7261443e192fb355033f7ff1cc01ea47c33
2016-06-08 22:55:39 +00:00
Adam Lesinski
4ae9097f69 Merge \"Consume the first sample of KernelUidCpuTimeReader\" into nyc-dev
am: e5417a3863

Change-Id: I67f604fbacba0efb95ff01b2de5bd7799eb8c3d9
2016-06-08 22:55:33 +00:00
Doris Liu
a6b967cfc5 Support Keyframe definition for AVD on RT
BUG: 27441613
Change-Id: Iece386f65f3704d1b7caa2b3690a8d3048ccf6e2
2016-06-08 15:21:15 -07: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
2f310da52e Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev am: 3e2bfbd135
am: 3feff1367b

Change-Id: I776625bbc557c747477db70235847dd8b3ab8baf
2016-06-08 06:44:24 +00:00
Lorenzo Colitti
3feff1367b Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev
am: 3e2bfbd135

Change-Id: I2305c4019f56896d741caa509df41416368e5642
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
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
5c32d65e78 Merge \"Revert \"Improve accessibility window title behavior\"\" into nyc-dev
am: fc71309640

Change-Id: I7b0c0636a69e4cc06d525f60d8621879ce45be22
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
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
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
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