Muyuan Li
d6c5ff2f3c
sysui: refactor for extensibility.
...
Make mHost in QuickStatusBarHeader protected.
Bug: 28759287
Change-Id: Ifd71a5c1c62f0672addea02bbd4bdd832b85862b
(cherry picked from commit d1c4238aa5038aa78a0987099abb6179c0f169fe)
2016-05-25 18:04:59 +00:00
Alex Klyubin
f2e0a719d0
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs
2016-05-25 18:04:54 +00:00
Chong Zhang
438266a4f7
Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev am: 15818e1156 am: 51cc0f48d7
...
am: 29f0dc25d2
* commit '29f0dc25d206e09e2a0a9ce48c086acd1c3bbbc1':
Destroy saved surfaces if one of the last visible windows gets removed
Change-Id: I2bceaa55d82c5dc829aa653077ab03171d5ea83a
2016-05-25 18:00:41 +00:00
Jason Monk
55b3322f48
Merge "Merge "QS Edit: Fix up accessibility" into nyc-dev am: c4b6e2a184 am: 36cc784180" into nyc-mr1-dev-plus-aosp
...
am: da3bebff8c
* commit 'da3bebff8cda96823ce88c9a492808418eb09044':
Change-Id: Ia86da7c3091c63bba730ad1e8af66efde2d92704
2016-05-25 18:00:35 +00:00
Jason Monk
e8c8dc1a53
Merge "Merge "QS Edit: Hide black bar in landscape" into nyc-dev am: 630436c9ed am: be195ae45f" into nyc-mr1-dev-plus-aosp
...
am: da2534b902
* commit 'da2534b902be5468b7654ee5328f117f857d70d5':
Change-Id: If6d6184e9876b949d1d5d0a7d40c69142b53eba0
2016-05-25 18:00:27 +00:00
Jason Monk
a80f5eb4f8
Merge "Merge "QS API: Handle return value from bindServiceAsUser" into nyc-dev am: 7e10e630b4 am: 08305d711d" into nyc-mr1-dev-plus-aosp
...
am: 7829d4a1bf
* commit '7829d4a1bf02d89f5baf8578e31fe57d071a9e44':
Change-Id: I4f616b54a82ba774ba46a946a7411e81f9d94c4e
2016-05-25 18:00:18 +00:00
Chris Banes
163236156f
Merge "Fix text appearances not working in colored button styles" into nyc-dev
2016-05-25 17:57:12 +00:00
Christopher Tate
3eddecc3bc
Build JobStatus objects outside the lock
...
Constructing a JobStatus can be a surprisingly heavy operation, potentially
involving IPC; so do so outside the primary lock when possible in order to
reduce lock contention.
Bug 28946245
Change-Id: I51fffa6d29d566647edb583ae6e46ed6038d36e3
2016-05-25 10:54:18 -07:00
Android Build Merger (Role)
b1f52d0b89
Merge "Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev am: 15818e1156 am: b56ea680fc" into nyc-mr1-dev-plus-aosp
2016-05-25 17:53:46 +00:00
Chong Zhang
c97737c85f
Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev am: 15818e1156
...
am: b56ea680fc
* commit 'b56ea680fc3fa650370b539c229986f21d4ed512':
Destroy saved surfaces if one of the last visible windows gets removed
Change-Id: I7860d2c6c4862dfbac060c76e74ca371435906e2
2016-05-25 17:53:20 +00:00
Chong Zhang
29f0dc25d2
Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev am: 15818e1156
...
am: 51cc0f48d7
* commit '51cc0f48d7730efacaee77b8479aeec81cff2d17':
Destroy saved surfaces if one of the last visible windows gets removed
Change-Id: I14fad31b6a9a4947e29d6fbe10c15e5122b95f1c
2016-05-25 17:53:14 +00:00
Christopher Tate
2be3de1723
Backport of backup transport whitelist
...
Sysconfig define a whitelist of permitted backup transports
Previously any apk bundled in priv-app could insert a backup transport.
Reduce risk surface by giving the OEM explicit control over who is
allowed to handle backup data.
Bug 28406080
Backport of 494df79172 from N
Change-Id: I9f90e324169a68720d608f74754d284a7e59cf87
2016-05-25 10:51:38 -07:00
Android Build Merger (Role)
b98ca24f40
Merge "Merge "Merge "QS: Fix QS touch breaking" into nyc-dev am: 8fd8a4fde8 am: 45ddf4891f" into nyc-mr1-dev-plus-aosp am: 71bd46c92b"
2016-05-25 17:48:17 +00:00
Android Build Merger (Role)
49c6695fb6
Merge "Merge "QS Edit: Fix up accessibility" into nyc-dev am: c4b6e2a184 am: 9ed92d72c6 am: 25645f1c63"
2016-05-25 17:48:09 +00:00
Android Build Merger (Role)
1fadeaf07c
Merge "Merge "QS Edit: Hide black bar in landscape" into nyc-dev am: 630436c9ed am: c032a33222 am: db68f29631"
2016-05-25 17:47:59 +00:00
Android Build Merger (Role)
9034773777
Merge "Merge "QS API: Handle return value from bindServiceAsUser" into nyc-dev am: 7e10e630b4 am: ed90fcae3c am: 25726968b1"
2016-05-25 17:47:52 +00:00
Android Build Merger (Role)
6e8a3d6ca1
Merge "Merge "QS: Fix QS touch breaking" into nyc-dev am: 8fd8a4fde8 am: 2d202facb4 am: 9f3eecb2e1"
2016-05-25 17:47:42 +00:00
Jason Monk
a94a420ac4
Merge "Merge "QS: Fix QS touch breaking" into nyc-dev am: 8fd8a4fde8 am: 45ddf4891f" into nyc-mr1-dev-plus-aosp
...
am: 71bd46c92b
* commit '71bd46c92b0dbd0228289bd2aec62a6f139df578':
Change-Id: I6cd43fa46796b351590b3b1a5f9cb545e0d81a33
2016-05-25 17:47:05 +00:00
Jason Monk
78f7235c7b
Merge "QS Edit: Fix up accessibility" into nyc-dev am: c4b6e2a184 am: 9ed92d72c6
...
am: 25645f1c63
* commit '25645f1c63be4895ee24b138fe209d6e767ed8a3':
QS Edit: Fix up accessibility
Change-Id: I454efa4178e1779df38e1bdac041e452572196b8
2016-05-25 17:46:56 +00:00
TreeHugger Robot
e1b53d7cab
Merge "Add missing @Deprecated annotations."
2016-05-25 17:46:40 +00:00
Jason Monk
f9ebbd213e
Merge "QS Edit: Hide black bar in landscape" into nyc-dev am: 630436c9ed am: c032a33222
...
am: db68f29631
* commit 'db68f29631804e5bb70f52bc7d5a377e42d1e1f6':
QS Edit: Hide black bar in landscape
Change-Id: Id5e09ff4dfa58f2c5c456ddf7300abdec886478f
2016-05-25 17:46:37 +00:00
Jason Monk
3c9ec30596
Merge "QS API: Handle return value from bindServiceAsUser" into nyc-dev am: 7e10e630b4 am: ed90fcae3c
...
am: 25726968b1
* commit '25726968b100e15aac0d67078835051d913178b7':
QS API: Handle return value from bindServiceAsUser
Change-Id: I46d9c6959280998c27e6d5928ed852c80931c90a
2016-05-25 17:45:52 +00:00
Jason Monk
4af162a066
Merge "QS: Fix QS touch breaking" into nyc-dev am: 8fd8a4fde8 am: 2d202facb4
...
am: 9f3eecb2e1
* commit '9f3eecb2e1519102fdb6b15ea86f194efe61fbd7':
QS: Fix QS touch breaking
Change-Id: I635dc3c6fa41ff14aa80f0dcd066289751c00070
2016-05-25 17:45:10 +00:00
Chong Zhang
51cc0f48d7
Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev
...
am: 15818e1156
* commit '15818e1156101f1d3a01009e7bc223d8ae88546d':
Destroy saved surfaces if one of the last visible windows gets removed
Change-Id: I96e3ac246e18f1b6cc222ef847275ce15043b441
2016-05-25 17:42:35 +00:00
Chong Zhang
b56ea680fc
Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev
...
am: 15818e1156
* commit '15818e1156101f1d3a01009e7bc223d8ae88546d':
Destroy saved surfaces if one of the last visible windows gets removed
Change-Id: I143743940263578e7111ae41eb7b88c005be18a6
2016-05-25 17:42:33 +00:00
Julia Reynolds
f42f8f93fa
Merge "Merge changes from topic \'cps\' into nyc-dev am: d3827be162 am: 39c013811e" into nyc-mr1-dev-plus-aosp
...
am: d6801ac612
* commit 'd6801ac612afa3a948b8302b9aac3f05713bc4e8':
Change-Id: I6bb005a160c86038608e2bc50fa1639aef73a239
2016-05-25 17:37:05 +00:00
Julia Reynolds
847007297b
Merge changes from topic \'cps\' into nyc-dev am: d3827be162 am: 5bf51f026c
...
am: 88be37e50a
* commit '88be37e50a9a1fce703a95d9fb90b975de06a286':
Api updates.
Note timezone changes.
Change-Id: I01c59a43b65c51a3968d16f6791c703fd495be5e
2016-05-25 17:36:19 +00:00
Android Build Merger (Role)
da3bebff8c
Merge "Merge "QS Edit: Fix up accessibility" into nyc-dev am: c4b6e2a184 am: 36cc784180" into nyc-mr1-dev-plus-aosp
2016-05-25 17:33:12 +00:00
John Reck
ca4da27fc1
Merge "Fix a translate issue with saveLayer" into nyc-dev am: f4ae997719 am: c57a36a634
...
am: d1b40a5f04
* commit 'd1b40a5f0412510dbfc611e2a4166eea3cf149c9':
Change-Id: I56ed581312de7d45ea272fba11e12031184bc90c
2016-05-25 17:33:08 +00:00
Android Build Merger (Role)
da2534b902
Merge "Merge "QS Edit: Hide black bar in landscape" into nyc-dev am: 630436c9ed am: be195ae45f" into nyc-mr1-dev-plus-aosp
2016-05-25 17:33:00 +00:00
John Reck
fa29d8c368
Merge "Merge "Fix a translate issue with saveLayer" into nyc-dev am: f4ae997719 am: e5a3df612a" into nyc-mr1-dev-plus-aosp
...
am: ebe36fb4f7
* commit 'ebe36fb4f7800ae58777809d765ff207a4c30f8f':
Fix a translate issue with saveLayer
Change-Id: I061f21b1e2ab6764394e9e95d2f2757bb84f6268
2016-05-25 17:32:58 +00:00
Diego Perez
2add88a017
Merge "Merge "Workaround to display menus for AppCompat themes" into nyc-dev am: 36cd747bb6 am: 6cc7426439" into nyc-mr1-dev-plus-aosp
...
am: c9187dd4f7
* commit 'c9187dd4f7e96e9e5128648a0fb3222d26236266':
Change-Id: Id216f31bec21a8e561eef947a0f2768a2b3d3070
2016-05-25 17:32:47 +00:00
Android Build Merger (Role)
7829d4a1bf
Merge "Merge "QS API: Handle return value from bindServiceAsUser" into nyc-dev am: 7e10e630b4 am: 08305d711d" into nyc-mr1-dev-plus-aosp
2016-05-25 17:32:41 +00:00
Diego Perez
64b185e49d
Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev am: cfbca5640c am: 9bb16a480d
...
am: 5e2de2eb12
* commit '5e2de2eb1221c9dafd260b42c732417cfc2b074f':
Workaround to display menus for AppCompat themes
Change-Id: I5042125c7797c7534c0c83d2e7370d7c5f70be94
2016-05-25 17:32:33 +00:00
Android Build Merger (Role)
71bd46c92b
Merge "Merge "QS: Fix QS touch breaking" into nyc-dev am: 8fd8a4fde8 am: 45ddf4891f" into nyc-mr1-dev-plus-aosp
2016-05-25 17:32:28 +00:00
Chong Zhang
15818e1156
Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev
2016-05-25 17:32:21 +00:00
Alan Viverette
9eab5b40b5
Merge "Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev am: cfbca5640c am: ffa81d0440" into nyc-mr1-dev-plus-aosp
...
am: 2753194ca8
* commit '2753194ca89ec9da399b703e49d7455e2ee3639d':
Change-Id: I597c0d693fde1d49c5a45d9eca4d5886350a81f8
2016-05-25 17:32:04 +00:00
Jason Monk
e8156cc30c
Merge "QS Edit: Fix up accessibility" into nyc-dev am: c4b6e2a184
...
am: 36cc784180
* commit '36cc78418011fa376a05ac44f25511e34ccf200c':
QS Edit: Fix up accessibility
Change-Id: I547559a4e22203286b249afa70b98d18a2e68305
2016-05-25 17:31:31 +00:00
Jason Monk
b64ad56310
Merge "QS Edit: Hide black bar in landscape" into nyc-dev am: 630436c9ed
...
am: be195ae45f
* commit 'be195ae45f1417ed38d50419e0d6f05d2a14d608':
QS Edit: Hide black bar in landscape
Change-Id: Ida6200fe3a6bfa45c154b8b0ae382e6ee337988c
2016-05-25 17:31:16 +00:00
Jason Monk
44196ce297
Merge "QS API: Handle return value from bindServiceAsUser" into nyc-dev am: 7e10e630b4
...
am: 08305d711d
* commit '08305d711d626ebe58661b2c5c4dbda593b27cf7':
QS API: Handle return value from bindServiceAsUser
Change-Id: I21d3343f11940b29a2cf81801514956110b50667
2016-05-25 17:30:56 +00:00
Jason Monk
fddc464cf4
Merge "QS: Fix QS touch breaking" into nyc-dev am: 8fd8a4fde8
...
am: 45ddf4891f
* commit '45ddf4891f328265b2b64a1e2fade5e443be8a23':
QS: Fix QS touch breaking
Change-Id: I2b691a0c3b2ce122dbd4a9262d9b26bf5aa3558e
2016-05-25 17:30:41 +00:00
Jason Monk
25645f1c63
Merge "QS Edit: Fix up accessibility" into nyc-dev am: c4b6e2a184
...
am: 9ed92d72c6
* commit '9ed92d72c6df6f3c255ca967b416bf5270779afa':
QS Edit: Fix up accessibility
Change-Id: I5832194e92451c50cb028cccac08697e10047e08
2016-05-25 17:30:22 +00:00
Jason Monk
db68f29631
Merge "QS Edit: Hide black bar in landscape" into nyc-dev am: 630436c9ed
...
am: c032a33222
* commit 'c032a332226fb88ff46d225e9ffe627538fb922a':
QS Edit: Hide black bar in landscape
Change-Id: I5d514090b2c346bbda77e5301bb8716b64bb5089
2016-05-25 17:30:17 +00:00
Jason Monk
25726968b1
Merge "QS API: Handle return value from bindServiceAsUser" into nyc-dev am: 7e10e630b4
...
am: ed90fcae3c
* commit 'ed90fcae3ce426de2796b45a72af03574ad98589':
QS API: Handle return value from bindServiceAsUser
Change-Id: Id8eb8df8a73f6e9e73a19ee85da40aa594da8209
2016-05-25 17:30:12 +00:00
Jason Monk
9f3eecb2e1
Merge "QS: Fix QS touch breaking" into nyc-dev am: 8fd8a4fde8
...
am: 2d202facb4
* commit '2d202facb4ccb7aa56373241ca60ab1be843436f':
QS: Fix QS touch breaking
Change-Id: Ie9842470a766d0fdd4d4672ad597f66348895f00
2016-05-25 17:30:05 +00:00
Android Build Merger (Role)
d6801ac612
Merge "Merge changes from topic \'cps\' into nyc-dev am: d3827be162 am: 39c013811e" into nyc-mr1-dev-plus-aosp
2016-05-25 17:23:40 +00:00
Julia Reynolds
5b13dcb43f
Merge changes from topic \'cps\' into nyc-dev am: d3827be162
...
am: 39c013811e
* commit '39c013811e994b8b7e037e2f2c1cfbafd8728aee':
Api updates.
Note timezone changes.
Change-Id: Ic0b560085b9a871daa2b0670fdc99ff78c878852
2016-05-25 17:22:55 +00:00
Julia Reynolds
88be37e50a
Merge changes from topic \'cps\' into nyc-dev am: d3827be162
...
am: 5bf51f026c
* commit '5bf51f026cddca00b156f93089cb803e4c612d96':
Api updates.
Note timezone changes.
Change-Id: Ic175b68e0c8000c1fe613f0e213631d7e1275f2d
2016-05-25 17:21:58 +00:00
Jason Monk
36cc784180
Merge "QS Edit: Fix up accessibility" into nyc-dev
...
am: c4b6e2a184
* commit 'c4b6e2a1849690a7f8dfa3be75ee84f1453f8224':
QS Edit: Fix up accessibility
Change-Id: I78ebafd7f118fc1220e1c76b0823d229a69ebd0f
2016-05-25 17:21:51 +00:00
Jason Monk
be195ae45f
Merge "QS Edit: Hide black bar in landscape" into nyc-dev
...
am: 630436c9ed
* commit '630436c9ed893b38059e4c9a6e03a753a2e84d3a':
QS Edit: Hide black bar in landscape
Change-Id: I1691d9911b646f93c1fecab0cdb03506b4c357cb
2016-05-25 17:21:44 +00:00