Selim Cinek
20367dbd3b
Merge changes I0ca13626,I3677ce54 into nyc-dev
...
am: bbcb733d80
2016-06-08 19:45:13 +00:00
Selim Cinek
bbcb733d80
Merge changes I0ca13626,I3677ce54 into nyc-dev
...
* changes:
Fixed a flicker when closing QS without notifications
Handled expandability and swiping while guts are exposed
2016-06-08 19:37:40 +00:00
Jason Monk
7399cf0ca6
Merge \"QS Edit: Extra extra make sure hidden when locked\" into nyc-dev
...
am: fd6e7e6790
2016-06-08 19:21:33 +00:00
Jason Monk
d97d435c09
Merge \"QS: Fix leak in QSAnimator\" into nyc-dev
...
am: 883da638e2
2016-06-08 19:21:29 +00:00
Jason Monk
781e8c2bfb
Merge \"QS: Show date even on small screens\" into nyc-dev
...
am: fbf366d7ee
2016-06-08 19:21:26 +00:00
Will Harmon
81f69753ed
Merge \"Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.\" into nyc-dev
...
am: 4455fc734c
2016-06-08 19:21:22 +00:00
Jason Monk
a62da52365
Merge \"Settings: Better handling for disabled tiles\" into nyc-dev
...
am: 27eadb6f1d
2016-06-08 19:15:34 +00:00
Jason Monk
fd6e7e6790
Merge "QS Edit: Extra extra make sure hidden when locked" into nyc-dev
2016-06-08 19:12:20 +00:00
Jason Monk
883da638e2
Merge "QS: Fix leak in QSAnimator" into nyc-dev
2016-06-08 19:12:07 +00:00
Jason Monk
fbf366d7ee
Merge "QS: Show date even on small screens" into nyc-dev
2016-06-08 19:11:41 +00:00
Jason Monk
4455fc734c
Merge "Fix crash when an app with an active quicksettings tile is updated to no longer have that tile." into nyc-dev
2016-06-08 19:11:16 +00:00
Will Harmon
604c2f9440
Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.
...
Fixes: 28721139
Change-Id: Ib53c7cc08e9378420a5fed3459c1e17864b28802
2016-06-08 19:10:57 +00:00
Jason Monk
27eadb6f1d
Merge "Settings: Better handling for disabled tiles" into nyc-dev
2016-06-08 19:10:10 +00:00
Alan Viverette
1bb283131f
Merge \"Return correct default theme on API >= 24\" into nyc-dev
...
am: afaa1e9db1
2016-06-08 18:35:22 +00:00
Ian Pedowitz
afaa1e9db1
Merge "Return correct default theme on API >= 24" into nyc-dev
2016-06-08 18:28:00 +00:00
Julia Reynolds
5431ee2aca
Merge \"Handle alarm firing outside of DND period.\" into nyc-dev
...
am: e1451c4e30
2016-06-08 18:24:04 +00:00
Julia Reynolds
e1451c4e30
Merge "Handle alarm firing outside of DND period." into nyc-dev
2016-06-08 18:19:13 +00:00
Felipe Leme
a18a63b23a
Merge \"Wrap closeQuietly() on finally block.\" into nyc-dev
...
am: fb5995cfbb
2016-06-08 18:16:43 +00:00
Amith Yamasani
c33507d441
Merge \"Add a separate read permission for oem unlock state\" into nyc-dev
...
am: 718f321369
2016-06-08 18:16:40 +00:00
Tianjie Xu
aebec60aa9
Merge \"Change unit of I/O statistics to MiB\" into nyc-dev
...
am: 00681d0e78
2016-06-08 18:08:50 +00:00
TreeHugger Robot
fb5995cfbb
Merge "Wrap closeQuietly() on finally block." into nyc-dev
2016-06-08 17:59:48 +00:00
Amith Yamasani
718f321369
Merge "Add a separate read permission for oem unlock state" into nyc-dev
2016-06-08 17:55:41 +00:00
Tianjie Xu
00681d0e78
Merge "Change unit of I/O statistics to MiB" into nyc-dev
2016-06-08 17:25:16 +00:00
Daniel Yu
2473e73e79
Merge \"docs: Updates for picture-in-picture docs for N DP4\" into nyc-dev
...
am: 22dec763a3
2016-06-08 16:34:07 +00:00
Dan Yu
22dec763a3
Merge "docs: Updates for picture-in-picture docs for N DP4" into nyc-dev
2016-06-08 16:22:27 +00:00
Felipe Leme
c74972f891
Wrap closeQuietly() on finally block.
...
BUG: 29123428
Change-Id: Ife7a919343ce4b73eef759bbc87dd37f12a71bca
2016-06-08 09:12:37 -07:00
Alan Viverette
4b2b615669
Return correct default theme on API >= 24
...
This method was broken, but it was returning light theme on N preview
builds, so we'll keep it consistent as we move into N release.
Bug: 29192690
Change-Id: I0d16abbe48756070dcd653c39d0da4124ea66b28
2016-06-08 11:45:15 -04:00
Ricky Wai
dfe00c9ed6
Merge \"Make Settings->Apps can handle work apps even work profile not enabled yet\" into nyc-dev
...
am: 18c8690b7e
2016-06-08 14:46:29 +00:00
Jeremy Joslin
65cc64dfbc
Merge \"Fix #29073394 : Need to bind to scorer after user is unlocked.\" into nyc-dev
...
am: 464f7e4983
2016-06-08 14:38:56 +00:00
Ricky Wai
18c8690b7e
Merge "Make Settings->Apps can handle work apps even work profile not enabled yet" into nyc-dev
2016-06-08 14:33:56 +00:00
TreeHugger Robot
464f7e4983
Merge "Fix #29073394 : Need to bind to scorer after user is unlocked." into nyc-dev
2016-06-08 14:32:43 +00:00
Baligh Uddin
ee384436c1
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: 002ccec5c1
2016-06-08 13:22:09 +00:00
Baligh Uddin
064464251f
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: e573989e05
2016-06-08 13:11:03 +00:00
Baligh Uddin
10b388fe9a
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: c20ea2eb43
2016-06-08 13:10:58 +00:00
Baligh Uddin
fde831f55d
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: 64d6fddc4b
2016-06-08 13:10:53 +00:00
Baligh Uddin
a9cd961151
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: 2d3c74a2fd
2016-06-08 13:10:48 +00:00
Baligh Uddin
002ccec5c1
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-08 13:09:25 +00:00
Jason Monk
fcad09a777
Settings: Better handling for disabled tiles
...
Push disabling into SettingsDrawerActivity and add a blacklist to
make sure they disappear immediately.
Change-Id: I79b9c596373cf9634008f6be88f4808af70eb071
Fixes: 29080209
2016-06-08 09:09:06 -04:00
Baligh Uddin
e573989e05
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-08 13:05:47 +00:00
Baligh Uddin
c20ea2eb43
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-08 13:05:43 +00:00
Baligh Uddin
64d6fddc4b
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-08 13:05:40 +00:00
Baligh Uddin
2d3c74a2fd
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-08 13:05:37 +00:00
Jason Monk
9ffd9f61d3
QS: Fix leak in QSAnimator
...
Change-Id: I54f1e083cf6ba6bfb5abc0f416680cbda1401980
Fixes: 29113833
2016-06-08 09:05:08 -04:00
Robin Lee
e4f8805d6a
Merge \"Package changed/removed listeners for always-on VPN\" into nyc-dev
...
am: ee5e4cc836
2016-06-08 10:50:43 +00:00
TreeHugger Robot
ee5e4cc836
Merge "Package changed/removed listeners for always-on VPN" into nyc-dev
2016-06-08 10:46:42 +00:00
Baligh Uddin
460b95639e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29169863
Change-Id: Ic7b964650e55d381c9b2f7a18f1358a5cc033d21
2016-06-07 20:49:52 -07: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
fc71309640
Merge "Revert "Improve accessibility window title behavior"" into nyc-dev
2016-06-08 02:19:34 +00:00
Chong Zhang
cfefb2b85c
Merge \"Check if task was top of stack before it\'s removed\" into nyc-dev
...
am: 94b4029f03
2016-06-08 01:26:10 +00:00
Chong Zhang
1895addcef
Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev
...
am: 723e5afa9e
2016-06-08 01:19:03 +00:00
