OSDN Git Service
Cheryl Potter [Fri, 15 Jul 2016 23:28:23 +0000 (23:28 +0000)]
Merge \\\"docs: Add redirect for new AS Help menu item b/
30165151\\\" into nyc-dev am:
462e5aae83 am:
c9515ae39d
am:
cb8fbd4bea
Change-Id: I925aa8509cb197da6e2a9175abacadb027d9682b
Makoto Onuki [Fri, 15 Jul 2016 23:28:20 +0000 (23:28 +0000)]
Merge \\"Fix the allowed icon type error message\\" into nyc-mr1-dev am:
fd57d549cf
am:
3e3f0f1ba8
Change-Id: Iaa3eb26436dfa339ee7e095562344394dcd56b53
Mike Tsao [Fri, 15 Jul 2016 23:28:17 +0000 (23:28 +0000)]
Merge \\"Back up Night Light settings\\" into nyc-mr1-dev am:
9a0e444c22
am:
d4584a8fb5
Change-Id: I15db4e270c6306fc666c9f33914f242e9e21a1fd
Andrew Solovay [Fri, 15 Jul 2016 23:25:37 +0000 (23:25 +0000)]
Merge \"Merge \\\"docs: Updating image download pages for DP5\\\" into nyc-dev am:
84d59bc35d am:
37018626c9\" into nyc-mr1-dev-plus-aosp
am:
eb9b6ed05e
Change-Id: I926d20a6d494beb7aa449ddbd42b1bf09f33fbb8
Andrew Solovay [Fri, 15 Jul 2016 23:25:35 +0000 (23:25 +0000)]
Merge \\\"docs: Updating image download pages for DP5\\\" into nyc-dev am:
84d59bc35d am:
7005fff3f1
am:
0255dbb58d
Change-Id: I8a070eb4be0f405f25f6b5610c133a2f39666ef6
Adrian Roos [Fri, 15 Jul 2016 23:25:31 +0000 (23:25 +0000)]
Merge \\"Doze: Add config for fine grained proximity checks\\" into nyc-mr1-dev am:
4ba23f30b5
am:
e0cac111db
Change-Id: Iff1af5e273af306190539a91fed0876f19b38888
Adrian Roos [Fri, 15 Jul 2016 23:25:27 +0000 (23:25 +0000)]
Merge \\"Notification: Apply small icon level\\" into nyc-mr1-dev am:
9d8de73530
am:
8b942b2404
Change-Id: I8471581ac27fb1c35126635bdc655b8c8ddea328
Adrian Roos [Fri, 15 Jul 2016 23:25:19 +0000 (23:25 +0000)]
Merge \\"Add way to set live wallpaper across users\\" into nyc-mr1-dev am:
9a7c3bd577
am:
119840eb91
Change-Id: I16436af5b7ada58113d846b9836d302061730177
Dan Yu [Fri, 15 Jul 2016 23:14:04 +0000 (23:14 +0000)]
Merge \"Merge \\\"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\\\" into nyc-dev am:
344a7375d7 am:
d5b43852dc\" into nyc-mr1-dev-plus-aosp
am:
dbf1504128
Change-Id: Iacb23044e44049877b76e7a07426161f5a0a95f9
Daniel Yu [Fri, 15 Jul 2016 23:14:01 +0000 (23:14 +0000)]
Merge \\\"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\\\" into nyc-dev am:
344a7375d7 am:
7b10126ed6
am:
79b1bb4878
Change-Id: I014bece8c337e4997866668af8964cc76cd5d6cd
Svetoslav Ganov [Fri, 15 Jul 2016 23:13:59 +0000 (23:13 +0000)]
Merge \\"Prevent apps to overlay other apps via toast windows\\" into nyc-mr1-dev am:
e2d148b008
am:
cd263d56d2
Change-Id: I4971baf5ef2a522f8acea091023936e033f23cea
Jason Monk [Fri, 15 Jul 2016 23:13:56 +0000 (23:13 +0000)]
Merge \\"Reduce contention of ApplicationsState locks\\" into nyc-mr1-dev am:
9e133205e3
am:
b3bbcf256f
Change-Id: I15b3cd0e2690ad1c9f5bc04afc3224dd771d7ae0
Vineeta Srivastava [Fri, 15 Jul 2016 23:13:43 +0000 (23:13 +0000)]
Merge \\"Add carrier config to report IMEI on CDMA phone.\\" into nyc-mr1-dev am:
a5b923bdd7
am:
199290cdab
Change-Id: Ia4f53257e352b3f71810582867258ec318cf47d6
Fan Zhang [Fri, 15 Jul 2016 23:06:24 +0000 (23:06 +0000)]
Merge "resolve merge conflicts of
b9d34b3 to master"
Ben Lin [Fri, 15 Jul 2016 22:56:43 +0000 (22:56 +0000)]
Merge "Fix a crash happening on a context menu."
Cheryl Potter [Fri, 15 Jul 2016 22:08:21 +0000 (22:08 +0000)]
Merge \\"docs: Add redirect for new AS Help menu item b/
30165151\\" into nyc-dev am:
462e5aae83
am:
c9515ae39d
Change-Id: If4bf155a4f2afc268497ef6ddba646c3c5b6f335
Cheryl Potter [Fri, 15 Jul 2016 22:02:12 +0000 (22:02 +0000)]
Merge \"docs: Add redirect for new AS Help menu item b/
30165151\" into nyc-dev
am:
462e5aae83
Change-Id: I13223f73b59cce6f9ed4256af0cfeba12e2d1771
Cheryl Potter [Fri, 15 Jul 2016 21:55:04 +0000 (21:55 +0000)]
Merge "docs: Add redirect for new AS Help menu item b/
30165151" into nyc-dev
Makoto Onuki [Fri, 15 Jul 2016 21:50:46 +0000 (21:50 +0000)]
Merge \"Fix the allowed icon type error message\" into nyc-mr1-dev
am:
fd57d549cf
Change-Id: Ibff8d87533d075f0af95ab98d44f67fd4405a951
TreeHugger Robot [Fri, 15 Jul 2016 21:43:01 +0000 (21:43 +0000)]
Merge "Fix the allowed icon type error message" into nyc-mr1-dev
Mike Tsao [Fri, 15 Jul 2016 21:33:57 +0000 (21:33 +0000)]
Merge \"Back up Night Light settings\" into nyc-mr1-dev
am:
9a0e444c22
Change-Id: I4bc968dfced4671fecb140c50ce759b02d78c4a1
TreeHugger Robot [Fri, 15 Jul 2016 21:28:33 +0000 (21:28 +0000)]
Merge "Back up Night Light settings" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 15 Jul 2016 21:23:02 +0000 (21:23 +0000)]
Merge "Merge \\"docs: Updating image download pages for DP5\\" into nyc-dev am:
84d59bc35d am:
37018626c9" into nyc-mr1-dev-plus-aosp
Andrew Solovay [Fri, 15 Jul 2016 21:22:38 +0000 (21:22 +0000)]
Merge \\"docs: Updating image download pages for DP5\\" into nyc-dev am:
84d59bc35d
am:
37018626c9
Change-Id: I6ebeb1bcea4014437244cbec609d20b74f5d0b3d
Andrew Solovay [Fri, 15 Jul 2016 21:22:23 +0000 (21:22 +0000)]
Merge \\"docs: Updating image download pages for DP5\\" into nyc-dev am:
84d59bc35d
am:
7005fff3f1
Change-Id: Ib05fc77234b2c2423a2dcf962d74781200a2ad0b
Fan Zhang [Fri, 15 Jul 2016 21:21:47 +0000 (14:21 -0700)]
resolve merge conflicts of
b9d34b3 to master
Change-Id: Id88ecf373378f9ed7c18a3d2d84ab419dd033891
Adrian Roos [Fri, 15 Jul 2016 21:16:49 +0000 (21:16 +0000)]
Merge \"Doze: Add config for fine grained proximity checks\" into nyc-mr1-dev
am:
4ba23f30b5
Change-Id: Ibd911a479877fe6e944fcd421807c052fa05df70
Adrian Roos [Fri, 15 Jul 2016 21:16:41 +0000 (21:16 +0000)]
Merge \"Notification: Apply small icon level\" into nyc-mr1-dev
am:
9d8de73530
Change-Id: Iac5f0b6e210355867f79cbc7f48165517ba11a26
Adrian Roos [Fri, 15 Jul 2016 21:16:36 +0000 (21:16 +0000)]
Merge \"Add way to set live wallpaper across users\" into nyc-mr1-dev
am:
9a7c3bd577
Change-Id: Ia5630143df774d76d5867e8e9541775e07e1c5df
Andrew Solovay [Fri, 15 Jul 2016 21:16:12 +0000 (21:16 +0000)]
Merge \"docs: Updating image download pages for DP5\" into nyc-dev
am:
84d59bc35d
Change-Id: I55e20f874b01109861f06f92d7f4586e155a0786
Andrew Solovay [Fri, 15 Jul 2016 21:16:06 +0000 (21:16 +0000)]
Merge \"docs: Updating image download pages for DP5\" into nyc-dev
am:
84d59bc35d
Change-Id: I9c9f5afb071adccacc27b2479330ddbd121a631f
Adrian Roos [Fri, 15 Jul 2016 21:09:50 +0000 (21:09 +0000)]
Merge "Doze: Add config for fine grained proximity checks" into nyc-mr1-dev
Adrian Roos [Fri, 15 Jul 2016 21:09:36 +0000 (21:09 +0000)]
Merge "Notification: Apply small icon level" into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 21:08:45 +0000 (21:08 +0000)]
Merge "docs: Updating image download pages for DP5" into nyc-dev
TreeHugger Robot [Fri, 15 Jul 2016 21:07:30 +0000 (21:07 +0000)]
Merge "Add way to set live wallpaper across users" into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 20:42:15 +0000 (20:42 +0000)]
Merge "Remove vestigial config setting."
Cheryl Potter [Fri, 15 Jul 2016 20:41:57 +0000 (13:41 -0700)]
docs: Add redirect for new AS Help menu item
b/
30165151
Change-Id: I23cebb22ab697f750846cccb2eb42088a22f1cc9
Kevin Hufnagle [Fri, 15 Jul 2016 20:30:22 +0000 (20:30 +0000)]
Merge \\\"docs: Added note about limited support for hardware key attestation\\\" into nyc-dev am:
68b98bc608 am:
6198b6cdfb
am:
ed5ce4a792
Change-Id: I1f1f767781c93166cb085ebaed32036aee367f05
Makoto Onuki [Fri, 15 Jul 2016 20:23:54 +0000 (13:23 -0700)]
Fix the allowed icon type error message
Bug
30162778
Change-Id: I925c563c1924c6525fe17afc44626d62864ba7e1
Kevin Hufnagle [Fri, 15 Jul 2016 20:19:23 +0000 (20:19 +0000)]
Merge \\\"docs: Added note about limited support for hardware key attestation\\\" into nyc-dev am:
68b98bc608 am:
6198b6cdfb
am:
eb6124cbaf
Change-Id: I424b5a33d00437e9092e3aa681d9b5fa5524dd63
Vladislav Kaznacheev [Fri, 15 Jul 2016 20:19:20 +0000 (20:19 +0000)]
Merge \\"Always return valid ClipDescription for ACTION_DRAG_EXITED\\" into nyc-mr1-dev am:
278676bdeb
am:
b604ade452
Change-Id: Ie779f0a6ca15f6f190a6361bddc4982b522004cd
Chong Zhang [Fri, 15 Jul 2016 20:19:18 +0000 (20:19 +0000)]
Merge \\"Don\\'t release surface if relayout is visible\\" into nyc-mr1-dev am:
465376c5ae
am:
8e8c07cd2e
Change-Id: Icbd15f921c450c4951f6cfaa345c1746e560600c
Adrian Roos [Fri, 15 Jul 2016 20:19:15 +0000 (20:19 +0000)]
Merge \\"Add ApplicationErrorReport tests\\" into nyc-mr1-dev am:
f86d855125
am:
4b39cfe203
Change-Id: I6510e4bb75e0780baef8e7a80622d8bbad9a932a
Ruben Brunk [Fri, 15 Jul 2016 20:19:12 +0000 (20:19 +0000)]
Merge \\"Remove VR package disable logic.\\" into nyc-mr1-dev am:
b005e0685f
am:
b983261885
Change-Id: I49e7e868ea5ca1db3ba6efba25027ecb3874f6e5
Android Build Merger (Role) [Fri, 15 Jul 2016 20:17:35 +0000 (20:17 +0000)]
Merge "Merge \\"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\\" into nyc-dev am:
344a7375d7 am:
d5b43852dc" into nyc-mr1-dev-plus-aosp
Dan Yu [Fri, 15 Jul 2016 20:17:01 +0000 (20:17 +0000)]
Merge \\"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\\" into nyc-dev am:
344a7375d7
am:
d5b43852dc
Change-Id: I54158112da7872a7968cd4661c4f321ca459c9db
Chris Tate [Fri, 15 Jul 2016 20:16:53 +0000 (20:16 +0000)]
Merge \\"Turn down restore-time logspam\\" into nyc-mr1-dev am:
a46b7f44c0
am:
c577b1be52
Change-Id: I86397a6cc792bbcf7c3c86e720446093f630aca7
Bert McMeen [Fri, 15 Jul 2016 20:16:50 +0000 (20:16 +0000)]
Merge \"Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c am:
8432d4328d am:
5c7a3e4867\" into nyc-mr1-dev-plus-aosp
am:
0a7063a2a0
Change-Id: I3542cbbd52bf1bf21d7209a5292d4b68268243ef
Bert McMeen [Fri, 15 Jul 2016 20:16:47 +0000 (20:16 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c am:
8432d4328d am:
e6430efbcf
am:
9b6a7ee515
Change-Id: I3b0d0a63146f2919236737ec4ac8811240068518
Jason Monk [Fri, 15 Jul 2016 20:16:44 +0000 (20:16 +0000)]
Merge \\"QS: Don\\'t use ComponentName to identify tiles\\" into nyc-mr1-dev am:
a0967ebbdf
am:
356d4914b2
Change-Id: I83fad6237edfb9516e1fe40612b820c319f26cc5
Esteban Talavera [Fri, 15 Jul 2016 20:16:39 +0000 (20:16 +0000)]
Merge \\"Disallow user to block notification from OobConfig\\" into nyc-mr1-dev am:
28763c5a77
am:
65aeef9d87
Change-Id: I466d5bbf617e50f85ef3b63564ee1945f64710f2
Dan Yu [Fri, 15 Jul 2016 20:15:40 +0000 (20:15 +0000)]
Merge \\"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\\" into nyc-dev am:
344a7375d7
am:
7b10126ed6
Change-Id: I3e28ba70ad33d32b293c9f11b5a5110e0e8a5fc7
Mike Tsao [Fri, 15 Jul 2016 16:54:07 +0000 (09:54 -0700)]
Back up Night Light settings
Bug:
30150787
Change-Id: I79697b41b68e0f123de20e7b8782c6058bef7977
Daniel Yu [Fri, 15 Jul 2016 20:09:41 +0000 (20:09 +0000)]
Merge \"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\" into nyc-dev
am:
344a7375d7
Change-Id: Ia090eda73ad984c7e15a94c9b318e3a314fe0582
Daniel Yu [Fri, 15 Jul 2016 20:09:34 +0000 (20:09 +0000)]
Merge \"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\" into nyc-dev
am:
344a7375d7
Change-Id: I9f05ab3452788942b6fc3e0d45ed92e0e5401ea6
Jason Monk [Fri, 15 Jul 2016 20:08:39 +0000 (20:08 +0000)]
Merge "resolve merge conflicts of
4481b51 to master"
Svet Ganov [Fri, 15 Jul 2016 20:03:33 +0000 (20:03 +0000)]
Merge \"Prevent apps to overlay other apps via toast windows\" into nyc-mr1-dev
am:
e2d148b008
Change-Id: I73f802b9b1c4acd5b17c706372f42c9e5d388840
Dan Yu [Fri, 15 Jul 2016 19:59:56 +0000 (19:59 +0000)]
Merge "docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5" into nyc-dev
Svetoslav Ganov [Fri, 15 Jul 2016 19:56:41 +0000 (19:56 +0000)]
Merge "Prevent apps to overlay other apps via toast windows" into nyc-mr1-dev
Jason Monk [Fri, 15 Jul 2016 19:55:45 +0000 (19:55 +0000)]
Merge \"Reduce contention of ApplicationsState locks\" into nyc-mr1-dev
am:
9e133205e3
Change-Id: I3ac7fca652b60ebc66e8804e31c8cfd034b8b037
TreeHugger Robot [Fri, 15 Jul 2016 19:52:08 +0000 (19:52 +0000)]
Merge "Reduce contention of ApplicationsState locks" into nyc-mr1-dev
Junda Liu [Fri, 15 Jul 2016 19:50:46 +0000 (19:50 +0000)]
Merge \"Add carrier config to report IMEI on CDMA phone.\" into nyc-mr1-dev
am:
a5b923bdd7
Change-Id: I383718bd1e756f560485b12259f6a5c98dc8a8f6
Vineeta Srivastava [Fri, 15 Jul 2016 19:44:44 +0000 (19:44 +0000)]
Merge "Add carrier config to report IMEI on CDMA phone." into nyc-mr1-dev
Chad Brubaker [Fri, 15 Jul 2016 19:33:12 +0000 (19:33 +0000)]
Merge "Mention target API limits for ACTION_STORAGE_CHANGED"
Steve McKay [Fri, 15 Jul 2016 19:21:43 +0000 (12:21 -0700)]
Remove vestigial config setting.
Change-Id: I8cd1558ae76833d4f0e511f05fc6e66d9ff44a7e
Kevin Hufnagle [Fri, 15 Jul 2016 19:12:28 +0000 (19:12 +0000)]
Merge \\"docs: Added note about limited support for hardware key attestation\\" into nyc-dev am:
68b98bc608
am:
7703ce2d21
Change-Id: I1ec301fa937ef74193667f43891d8e0e09737dfd
TreeHugger Robot [Fri, 15 Jul 2016 19:08:10 +0000 (19:08 +0000)]
Merge "Align empty views for quicksetting center in detail panel." into nyc-mr1-dev
Android Build Merger (Role) [Fri, 15 Jul 2016 19:07:01 +0000 (19:07 +0000)]
Merge "Merge \\"docs: Added note about limited support for hardware key attestation\\" into nyc-dev am:
68b98bc608 am:
ca5c7da9d0" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Fri, 15 Jul 2016 19:06:38 +0000 (19:06 +0000)]
Merge \\"docs: Added note about limited support for hardware key attestation\\" into nyc-dev am:
68b98bc608
am:
ca5c7da9d0
Change-Id: I36f43c1094d90cf531c0d12b6b24a2d00236b0db
Kevin Hufnagle [Fri, 15 Jul 2016 19:06:23 +0000 (19:06 +0000)]
Merge \\"docs: Added note about limited support for hardware key attestation\\" into nyc-dev am:
68b98bc608
am:
6198b6cdfb
Change-Id: Icce0f6f456fddc098597b7f656db368733250583
Adam Lesinski [Fri, 15 Jul 2016 19:06:10 +0000 (19:06 +0000)]
Merge "Build SystemUI and Keyguard with AAPT2"
Junda Liu [Thu, 14 Jul 2016 20:55:03 +0000 (13:55 -0700)]
Add carrier config to report IMEI on CDMA phone.
Bug: b/
29340579
Change-Id: I3cac49af4b173f971b8153c00227141378f32b43
Kevin Hufnagle [Fri, 15 Jul 2016 18:58:07 +0000 (18:58 +0000)]
Merge \"docs: Added note about limited support for hardware key attestation\" into nyc-dev
am:
68b98bc608
Change-Id: I1ae42e82f830ac939491c7d754d71420ec2092d9
Andrew Solovay [Thu, 14 Jul 2016 22:51:58 +0000 (15:51 -0700)]
docs: Updating image download pages for DP5
Updating with current images, which I've also uploaded to the cloud
share. I briefly made the cloud share public, so I could test the
download links and verify the checksums on the web page against the
downloaded files; the downloads and checksums all worked, so I made
the cloud files private again (so the links in these pages don't
work at the moment).
Also updated the download tables in the internationalized versions
of these files, since it's just a copy/paste.
See first comment for doc stage location.
bug:
29738757
Change-Id: I384786dcdf0dd249be0d1d0e38c88fa2b2109e0b
Kevin Hufnagle [Fri, 15 Jul 2016 18:56:32 +0000 (18:56 +0000)]
Merge \"docs: Added note about limited support for hardware key attestation\" into nyc-dev
am:
68b98bc608
Change-Id: I07e7c0a91f7e75d5713b93aa27c06ef2631ea276
Kevin Hufnagle [Fri, 15 Jul 2016 18:44:09 +0000 (18:44 +0000)]
Merge "docs: Added note about limited support for hardware key attestation" into nyc-dev
Daniel Yu [Wed, 13 Jul 2016 19:12:59 +0000 (12:12 -0700)]
docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus()
and Direct Boot for DP5
getStorageEncryptionStatus() now returns new
ENCRYPTION_STATUS_ACTIVE_PER_USER if the device is not
using direct boot (and the not-new ENCRYPTION_STATUS_ACTIVE
is returned if direct boot is used)
Bug:
30112425
Change-Id: I27c11b2afe2afd9a19c9f8268f486b09af22e6ac
Vladislav Kaznacheev [Fri, 15 Jul 2016 18:38:08 +0000 (18:38 +0000)]
Merge \"Always return valid ClipDescription for ACTION_DRAG_EXITED\" into nyc-mr1-dev
am:
278676bdeb
Change-Id: I51a339a1a821439b5c90079812aea56833872b75
Chong Zhang [Fri, 15 Jul 2016 18:37:59 +0000 (18:37 +0000)]
Merge \"Don\'t release surface if relayout is visible\" into nyc-mr1-dev
am:
465376c5ae
Change-Id: I47d834d26cee248900d268bbe027ea82fd7c286a
Adrian Roos [Fri, 15 Jul 2016 18:31:20 +0000 (18:31 +0000)]
Merge \"Add ApplicationErrorReport tests\" into nyc-mr1-dev
am:
f86d855125
Change-Id: I57d00e200ebf03010fca4ae0753200b981faaad4
TreeHugger Robot [Fri, 15 Jul 2016 18:26:50 +0000 (18:26 +0000)]
Merge "Always return valid ClipDescription for ACTION_DRAG_EXITED" into nyc-mr1-dev
Chong Zhang [Fri, 15 Jul 2016 18:26:27 +0000 (18:26 +0000)]
Merge "Don't release surface if relayout is visible" into nyc-mr1-dev
Adrian Roos [Fri, 15 Jul 2016 18:24:27 +0000 (18:24 +0000)]
Merge "Add ApplicationErrorReport tests" into nyc-mr1-dev
Adrian Roos [Thu, 14 Jul 2016 21:19:55 +0000 (14:19 -0700)]
Add way to set live wallpaper across users
Also adds an entry point for vendor specific services
to SystemUI.
Bug:
30038484
Change-Id: I8f335c1f7de15d619f2c688a8ac95372f166595f
Ben Lin [Thu, 14 Jul 2016 17:40:00 +0000 (10:40 -0700)]
Fix a crash happening on a context menu.
When an activity gets a callback for onContextItemSelected, it first
gets dibs on handling it, and then it propagates the call to -every-
fragment it is tied to. This poses a problem since RootsFragment and
DirectoryFragment don't necessarily handle each other's menu items well,
which can cause NPEs. This is some temporary fix for it.
Bug:
30092676
Change-Id: I3f268c9c9580504b78581ad92a24c9a99c4a0daf
(cherry picked from commit
3e1699f3a3f3d0378d758e3b0d430165867eb89e)
Ruben Brunk [Fri, 15 Jul 2016 18:15:42 +0000 (18:15 +0000)]
Merge \"Remove VR package disable logic.\" into nyc-mr1-dev
am:
b005e0685f
Change-Id: I0ee90e535d49ee04e6e26048e6e72e15b44fad17
Ruben Brunk [Fri, 15 Jul 2016 18:09:34 +0000 (18:09 +0000)]
Merge "Remove VR package disable logic." into nyc-mr1-dev
Christopher Tate [Fri, 15 Jul 2016 18:08:57 +0000 (18:08 +0000)]
Merge \"Turn down restore-time logspam\" into nyc-mr1-dev
am:
a46b7f44c0
Change-Id: Ied38c22902590f12044aa010b0573e4bc3dbc11e
Chris Tate [Fri, 15 Jul 2016 18:05:06 +0000 (18:05 +0000)]
Merge "Turn down restore-time logspam" into nyc-mr1-dev
Christopher Tate [Fri, 15 Jul 2016 17:53:15 +0000 (10:53 -0700)]
Turn down restore-time logspam
Bug
30160827
Change-Id: I14ccf0a31e5a6882bf189c28c79d1c139ec44bcc
Jason Monk [Fri, 15 Jul 2016 17:54:42 +0000 (13:54 -0400)]
Reduce contention of ApplicationsState locks
Change-Id: I5b2ad52b014eea5bdf77526554eb10f4ba303105
Fixes:
30113789
Fan Zhang [Fri, 15 Jul 2016 17:39:03 +0000 (10:39 -0700)]
Align empty views for quicksetting center in detail panel.
Change-Id: I6d0f1eaeee1ea59890cf0589381332a3f3a8fb4e
Fixes:
29981651
Android Build Merger (Role) [Fri, 15 Jul 2016 17:26:17 +0000 (17:26 +0000)]
Merge "Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c am:
8432d4328d am:
5c7a3e4867" into nyc-mr1-dev-plus-aosp
Bert McMeen [Fri, 15 Jul 2016 17:25:53 +0000 (17:25 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c am:
8432d4328d
am:
5c7a3e4867
Change-Id: Ic2330a5ebfff87285b2f68a02c2450d2e2f9355b
Bert McMeen [Fri, 15 Jul 2016 17:25:39 +0000 (17:25 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c am:
8432d4328d
am:
e6430efbcf
Change-Id: I7c7e23d1a79bf7fa252dc59b8317be932fbd9e5d
Bert McMeen [Fri, 15 Jul 2016 17:19:44 +0000 (17:19 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c
am:
8432d4328d
Change-Id: I8eff2a07e0cfc07a407607a4e064b3c130f2ab48
Bert McMeen [Fri, 15 Jul 2016 17:19:42 +0000 (17:19 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c
am:
8432d4328d
Change-Id: I65edec2172b347df56a4be699060bd456cfe3923
Bert McMeen [Fri, 15 Jul 2016 17:14:06 +0000 (17:14 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51
am:
274d904d4c
Change-Id: I2bf5f981b7b8b001ce3d25ff0179270e23d08588
Bert McMeen [Fri, 15 Jul 2016 17:08:31 +0000 (17:08 +0000)]
Docs: Behavior changes such as activity dismissal
am:
f506485b51
Change-Id: Ia133aef14f006a15304ca744d933eb8934c80bb5
Jason Monk [Fri, 15 Jul 2016 17:03:46 +0000 (17:03 +0000)]
Merge \"QS: Don\'t use ComponentName to identify tiles\" into nyc-mr1-dev
am:
a0967ebbdf
Change-Id: Ib98a48e46f711b927a1b9e8d2b8162a59bfa3240