Commit Graph

6476 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Phil Weaver
2a7e4442bf Improve accessibility window title behavior
Suppress the default, unlocalized strings from being read as title.

Bug: 28744278
Change-Id: Iea0f7d8fed3d6428ada725cf3ffa077ba974b74a
2016-05-25 12:48:13 -07:00
Ricky Wai
7b1ccf8700 Merge "Hide work profile key in user credentials screen am: d398244513 am: ed39b3b166" into nyc-mr1-dev-plus-aosp
am: b5e2592582

* commit 'b5e25925828dd5a23eaa2ea3a4cebcc6652d2762':
  Hide work profile key in user credentials screen

Change-Id: Ie10f57378d3cf1168a9200bf02f3b46d2d1bfe4b
2016-05-25 13:34:55 +00:00
Ricky Wai
750229fdf0 Hide work profile key in user credentials screen am: d398244513
am: ed39b3b166

* commit 'ed39b3b1666cff34e34c394029fad0ad9e426968':
  Hide work profile key in user credentials screen

Change-Id: I18cefc9f365ed83db5262676a1f4b9cc28b20c07
2016-05-25 13:27:41 +00:00
Ricky Wai
ed39b3b166 Hide work profile key in user credentials screen
am: d398244513

* commit 'd398244513c62c9ea14a0f1c6ffef832e803c16f':
  Hide work profile key in user credentials screen

Change-Id: I5273b53b07cb80d45bac61c8dcc5cba8f6b11b3a
2016-05-25 13:20:51 +00:00
Ricky Wai
276f168f10 Hide work profile key in user credentials screen
am: d398244513

* commit 'd398244513c62c9ea14a0f1c6ffef832e803c16f':
  Hide work profile key in user credentials screen

Change-Id: I7609dc8bc68e9c9eb2a969b58b31815d27d7fc4a
2016-05-25 13:18:26 +00:00
Ricky Wai
d398244513 Hide work profile key in user credentials screen
Bug: 28878708
Change-Id: Ib250fae2388b061430d93b7d65133002ce664993
2016-05-25 13:11:09 +00:00
Ricky Wai
4613fe41ac Add resetKeyStore() in LockSettingsService
Before resetKeyStore(), it will back up child profile keys,
and will be restored after primary profile keystore is cleared.

Bug: 28878708
Change-Id: I0cb4a1f885d468894bc7eb95af694328bf92ce16
2016-05-25 11:39:56 +01:00
Keisuke Kuroyanagi
32c0e434a7 Merge "Set input method mode for CascadingMenuPopup." into nyc-dev am: edebcae978 am: 66e5b59d85
am: c2a363fd24

* commit 'c2a363fd24a95e8afd9124e88e7c8227849744cf':
  Set input method mode for CascadingMenuPopup.

Change-Id: If142a782c2cf9b930e16382ab3986dd11821ed1b
2016-05-25 02:20:36 +00:00
Keisuke Kuroyanagi
c2a363fd24 Merge "Set input method mode for CascadingMenuPopup." into nyc-dev am: edebcae978
am: 66e5b59d85

* commit '66e5b59d852e7a746945b0a729cda287bd922187':
  Set input method mode for CascadingMenuPopup.

Change-Id: Ie9efc3abeec02062baccb68615b1ccee5526abd8
2016-05-25 02:17:01 +00:00
Keisuke Kuroyanagi
30f481368c Merge "Set input method mode for CascadingMenuPopup." into nyc-dev
am: edebcae978

* commit 'edebcae9781fa897914952e9346a14afd2e08967':
  Set input method mode for CascadingMenuPopup.

Change-Id: I117ea7e9b00fdd8eb26fd761a23925909318a12e
2016-05-25 02:11:26 +00:00
Keisuke Kuroyanagi
66e5b59d85 Merge "Set input method mode for CascadingMenuPopup." into nyc-dev
am: edebcae978

* commit 'edebcae9781fa897914952e9346a14afd2e08967':
  Set input method mode for CascadingMenuPopup.

Change-Id: I22fcbfb60161aaa660abc43bc9f739829f8e53a5
2016-05-25 02:11:22 +00:00
Keisuke Kuroyanagi
edebcae978 Merge "Set input method mode for CascadingMenuPopup." into nyc-dev 2016-05-25 02:06:25 +00:00
Tianjie Xu
9ae172f9b9 Merge "Report OTA time statistics" into nyc-dev am: 86f97177e9 am: 7135fab76c
am: 375a512c0d

* commit '375a512c0d99e58285b3e6d6f1045c5e3a9774d5':
  Report OTA time statistics

Change-Id: Icbd611fe4af2dd51d1ee946a80c0e0f4370a9634
2016-05-24 21:59:28 +00:00
Tianjie Xu
375a512c0d Merge "Report OTA time statistics" into nyc-dev am: 86f97177e9
am: 7135fab76c

* commit '7135fab76cb3e7f7a68547794b3ddf54f08facca':
  Report OTA time statistics

Change-Id: I82f174bfa383a26a87d45ac6675a3ae5812b50af
2016-05-24 21:47:52 +00:00
Michael Kwan
aeee0882f2 Merge "Fixed issue where ListView checked state did not account for ListView header." into nyc-mr1-dev am: 02178609c6
am: 9fcefb4c1d

* commit '9fcefb4c1d8554df4c8c14337e875bb33042d12f':
  Fixed issue where ListView checked state did not account for ListView header.

Change-Id: I24a239d5faa0b8b0c00384268fb02a817ad771f3
2016-05-24 21:41:30 +00:00
Tianjie Xu
acf91cd6c5 Merge "Report OTA time statistics" into nyc-dev
am: 86f97177e9

* commit '86f97177e959cb40229010b90f066fd602d6a06f':
  Report OTA time statistics

Change-Id: I271c156232c49a861579acd9ce90c91fbc7e5a4f
2016-05-24 21:41:06 +00:00
Tianjie Xu
7135fab76c Merge "Report OTA time statistics" into nyc-dev
am: 86f97177e9

* commit '86f97177e959cb40229010b90f066fd602d6a06f':
  Report OTA time statistics

Change-Id: I941b48f287fe72dbb3e0f61ccdea33deab3c34c5
2016-05-24 21:41:05 +00:00
Michael Kwan
9fcefb4c1d Merge "Fixed issue where ListView checked state did not account for ListView header." into nyc-mr1-dev
am: 02178609c6

* commit '02178609c69d395d7ddbae2db278e50572cceec3':
  Fixed issue where ListView checked state did not account for ListView header.

Change-Id: I6f5fd65a9632a2f262c2e7a807cae487c4d5c0bc
2016-05-24 21:35:07 +00:00
Michael Kwan
dcb28fff58 Fixed issue where ListView checked state did not account
for ListView header.

Bug: 17733928
Change-Id: If8e9daa9c9538ac86493045bc597461b44a2f823
2016-05-24 13:07:55 -07:00
Tianjie Xu
dcd3644f22 Report OTA time statistics
Read time and I/O for OTA update from last_install, and report the
statistics using MetricsLogger.histogram.

Bug: 28658632
Change-Id: I7fd06a82cbabd346d6d44f81ebad08f6baf4b8d0
2016-05-24 13:00:30 -07:00
Michael Kwan
827aab5c39 Merge "Initial update of Micro theme for Material design." into nyc-mr1-dev am: 1d66ae128d
am: 4cf99bed0f

* commit '4cf99bed0f987e09e0f1a73d92b1c62dd40d144d':
  Initial update of Micro theme for Material design.

Change-Id: I9dd4a4e7bf03389b6fde91ce7f4c41e85aab4b5e
2016-05-24 19:12:40 +00:00
Michael Kwan
4cf99bed0f Merge "Initial update of Micro theme for Material design." into nyc-mr1-dev
am: 1d66ae128d

* commit '1d66ae128d3b81623891e07fc9f5dfd15ee055c4':
  Initial update of Micro theme for Material design.

Change-Id: Iffb58e0f0d45796d2951c3566f72db058d665b5a
2016-05-24 18:54:56 +00:00
Michael Kwan
1d66ae128d Merge "Initial update of Micro theme for Material design." into nyc-mr1-dev 2016-05-24 18:47:06 +00:00
Toby Sargeant
450d664e90 Merge "Refactor ZygoteInit to support a WebView-specific zygote." 2016-05-24 08:45:04 +00:00
Joe Onorato
8472eee461 Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev am: 4dbdd5d971 am: c3db3e217f
am: 4f5febce80

* commit '4f5febce80711166077bb9b40d76bc51cc8cf848':
  Add data from /proc/pagetypeinfo to procstats.

Change-Id: I9e404c94c56fcb0a62a141b353dd76932947ca76
2016-05-23 21:54:59 +00:00
Joe Onorato
4f5febce80 Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev am: 4dbdd5d971
am: c3db3e217f

* commit 'c3db3e217f397153e9982bb29e37fc28e01062d2':
  Add data from /proc/pagetypeinfo to procstats.

Change-Id: Iddfcdfeb0ad1194488ce504d420696a83d20a786
2016-05-23 19:54:10 +00:00
Joe Onorato
c3db3e217f Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev
am: 4dbdd5d971

* commit '4dbdd5d97155364305abf7c010c165f1a6f79edb':
  Add data from /proc/pagetypeinfo to procstats.

Change-Id: Ic86eb0ad4278dc2d0b7f93148bab00a1f707dc16
2016-05-23 19:50:45 +00:00
Joe Onorato
97cdd11f2a Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev
am: 4dbdd5d971

* commit '4dbdd5d97155364305abf7c010c165f1a6f79edb':
  Add data from /proc/pagetypeinfo to procstats.

Change-Id: I3c455fe69244927dc5aebdf5ddb7b0badf6aeee8
2016-05-23 19:50:36 +00:00