Wei Wang
|
dfd2e37b01
|
Merge \\"Add launch power hint for activity launch end\\" into nyc-mr1-dev am: a4e2bf4712
am: 7bf837e652
Change-Id: Ie97f9acf378bb908e0fbd06ee8d67a90d0e5e807
|
2016-06-08 20:02:42 +00:00 |
|
Wei Wang
|
7bf837e652
|
Merge \"Add launch power hint for activity launch end\" into nyc-mr1-dev
am: a4e2bf4712
Change-Id: I6ffa3183f66121df9004880aa46e81f336ddfeae
|
2016-06-08 19:58:03 +00:00 |
|
Selim Cinek
|
9b1d30ee90
|
Merge changes I0ca13626,I3677ce54 into nyc-dev am: bbcb733d80 am: 20367dbd3b
am: 3ada4842b2
Change-Id: I8fd4ce070667157371e18e15c2e145f1938aa0ab
|
2016-06-08 19:57:32 +00:00 |
|
Wei Wang
|
a4e2bf4712
|
Merge "Add launch power hint for activity launch end" into nyc-mr1-dev
|
2016-06-08 19:53:25 +00:00 |
|
Jason Monk
|
c7ab3048fe
|
Merge \\\"QS Edit: Extra extra make sure hidden when locked\\\" into nyc-dev am: fd6e7e6790 am: 7399cf0ca6
am: b995b74377
Change-Id: I4a68e6325f48706be28ca352fb74794470a32d2a
|
2016-06-08 19:50:45 +00:00 |
|
Jason Monk
|
3530ff2df2
|
Merge \\\"QS: Fix leak in QSAnimator\\\" into nyc-dev am: 883da638e2 am: d97d435c09
am: e6d0ef984a
Change-Id: I03c8d79179c08e77984ee78bfc36c8c0ebb02c8e
|
2016-06-08 19:50:38 +00:00 |
|
Selim Cinek
|
3ada4842b2
|
Merge changes I0ca13626,I3677ce54 into nyc-dev am: bbcb733d80
am: 20367dbd3b
Change-Id: Id8cafbb4ee743d604626af882fe25f5a09296a2b
|
2016-06-08 19:49:57 +00:00 |
|
Jason Monk
|
1e86c376ea
|
resolve merge conflicts of 781e8c2 to nyc-mr1-dev-plus-aosp
am: ea92d5d1c0
Change-Id: I1aabe531b0a2a26828f0ec68de70158b8c11e3fb
|
2016-06-08 19:45:38 +00:00 |
|
Selim Cinek
|
20367dbd3b
|
Merge changes I0ca13626,I3677ce54 into nyc-dev
am: bbcb733d80
Change-Id: I1ab5db3410322ea9880ad4bce9b78b8355c0f2ce
|
2016-06-08 19:45:13 +00:00 |
|
Jason Monk
|
b995b74377
|
Merge \\"QS Edit: Extra extra make sure hidden when locked\\" into nyc-dev am: fd6e7e6790
am: 7399cf0ca6
Change-Id: I70215682074195d217e170daf94763ee5f5a6444
|
2016-06-08 19:44:50 +00:00 |
|
Jason Monk
|
e6d0ef984a
|
Merge \\"QS: Fix leak in QSAnimator\\" into nyc-dev am: 883da638e2
am: d97d435c09
Change-Id: I62c2c08e956a59e9c6cee2397a003cff960eb5d1
|
2016-06-08 19:44:48 +00:00 |
|
Will Harmon
|
2ba211b5ca
|
Merge \\\"Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.\\\" into nyc-dev am: 4455fc734c am: 81f69753ed
am: 202d7a4f48
Change-Id: Id1cb31d3ad2d8fe1f1e8c0c89ae27275c799e550
|
2016-06-08 19:41:13 +00:00 |
|
Jason Monk
|
ea92d5d1c0
|
resolve merge conflicts of 781e8c2 to nyc-mr1-dev-plus-aosp
Change-Id: I737217ecc25a6c480132c6f1a932c4579fa96e05
|
2016-06-08 15:39:30 -04: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
|
202d7a4f48
|
Merge \\"Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.\\" into nyc-dev am: 4455fc734c
am: 81f69753ed
Change-Id: I2b61ce54d42be0648f7d53e2a7e659da2c9c00d7
|
2016-06-08 19:34:38 +00:00 |
|
Jason Monk
|
e4a5c47fab
|
Merge \\\"Settings: Better handling for disabled tiles\\\" into nyc-dev am: 27eadb6f1d am: a62da52365
am: 739f895855
Change-Id: I943edc13cc7e7bec50eb28204cd005e9aa005972
|
2016-06-08 19:30:47 +00:00 |
|
Jason Monk
|
739f895855
|
Merge \\"Settings: Better handling for disabled tiles\\" into nyc-dev am: 27eadb6f1d
am: a62da52365
Change-Id: Ia348fefba31573d5dee51742f591507807ab7c66
|
2016-06-08 19:26:47 +00:00 |
|
Jason Monk
|
7399cf0ca6
|
Merge \"QS Edit: Extra extra make sure hidden when locked\" into nyc-dev
am: fd6e7e6790
Change-Id: I0fbfd17114fbcf6c4552d5f192ce17722272a6c6
|
2016-06-08 19:21:33 +00:00 |
|
Jason Monk
|
d97d435c09
|
Merge \"QS: Fix leak in QSAnimator\" into nyc-dev
am: 883da638e2
Change-Id: I7e8f106c741a8fc1b920bad2ffd65331463e148b
|
2016-06-08 19:21:29 +00:00 |
|
Jason Monk
|
781e8c2bfb
|
Merge \"QS: Show date even on small screens\" into nyc-dev
am: fbf366d7ee
Change-Id: I7650ec130e8bcf31b2924af96e8bb2c412111c17
|
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
Change-Id: I391ada63a040537925d8b8a8151d0e6d49a6e69b
|
2016-06-08 19:21:22 +00:00 |
|
Jason Monk
|
a62da52365
|
Merge \"Settings: Better handling for disabled tiles\" into nyc-dev
am: 27eadb6f1d
Change-Id: I6fd319a6bce9748db40ffc53849c68e2e8da5ad5
|
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 |
|
TreeHugger Robot
|
f7590b8750
|
Merge "Add class comments in WebViewUpdateServiceImpl."
|
2016-06-08 19:04:56 +00:00 |
|
Alan Viverette
|
8042dd846a
|
Merge \\\"Return correct default theme on API >= 24\\\" into nyc-dev am: afaa1e9db1 am: 1bb283131f
am: af2f098c8c
Change-Id: I5cbd140458a6fa354551bcfb1a73b0cffcbd8453
|
2016-06-08 19:03:43 +00:00 |
|
Julia Reynolds
|
98616abf72
|
Merge \\\"Handle alarm firing outside of DND period.\\\" into nyc-dev am: e1451c4e30 am: 5431ee2aca
am: 2a6f616385
Change-Id: I87ba4667946581206a53430932a7e37a98b96736
|
2016-06-08 19:03:41 +00:00 |
|
Felipe Leme
|
5493f0f6a2
|
Merge \\\"Wrap closeQuietly() on finally block.\\\" into nyc-dev am: fb5995cfbb am: a18a63b23a
am: ddafe182df
Change-Id: I48de6aee67b4d12c8185e35d5203e1dbb952a502
|
2016-06-08 19:03:38 +00:00 |
|
Amith Yamasani
|
9f62bf9370
|
resolve merge conflicts of c33507d to nyc-mr1-dev-plus-aosp
am: b8ab1d3b12
Change-Id: I9f4879ae27560ade8fa4e6124908c3dced68feb1
|
2016-06-08 19:03:36 +00:00 |
|
Ian Pedowitz
|
af2f098c8c
|
Merge \\"Return correct default theme on API >= 24\\" into nyc-dev am: afaa1e9db1
am: 1bb283131f
Change-Id: I2f21175998134e3ac03279307e7d6bb163614ce9
|
2016-06-08 18:59:14 +00:00 |
|
Julia Reynolds
|
2a6f616385
|
Merge \\"Handle alarm firing outside of DND period.\\" into nyc-dev am: e1451c4e30
am: 5431ee2aca
Change-Id: I64b304fe579100b097973ef443539d25e91c41ef
|
2016-06-08 18:59:12 +00:00 |
|
Felipe Leme
|
ddafe182df
|
Merge \\"Wrap closeQuietly() on finally block.\\" into nyc-dev am: fb5995cfbb
am: a18a63b23a
Change-Id: I3e6769579e08887888b1358be0cb695f32e13749
|
2016-06-08 18:59:10 +00:00 |
|
Amith Yamasani
|
b8ab1d3b12
|
resolve merge conflicts of c33507d to nyc-mr1-dev-plus-aosp
Change-Id: Id4b3de71842eedd49684b367ed993f44f2f91970
|
2016-06-08 11:50:57 -07:00 |
|
Alan Viverette
|
1bb283131f
|
Merge \"Return correct default theme on API >= 24\" into nyc-dev
am: afaa1e9db1
Change-Id: I620b5682bc4fa9752b1f1bf68d8ed1498db66a5d
|
2016-06-08 18:35:22 +00:00 |
|
Tianjie Xu
|
cbef2c7d88
|
Merge \\\"Change unit of I/O statistics to MiB\\\" into nyc-dev am: 00681d0e78 am: aebec60aa9
am: 475171de75
Change-Id: Ie5eda0f04e5bbc66dff3fa88804bb8d41705e5b9
|
2016-06-08 18:33:16 +00:00 |
|
Ian Pedowitz
|
afaa1e9db1
|
Merge "Return correct default theme on API >= 24" into nyc-dev
|
2016-06-08 18:28:00 +00:00 |
|
Tianjie Xu
|
ed18ad5ea2
|
Merge \\\"Change unit of I/O statistics to MiB\\\" into nyc-dev am: 00681d0e78 am: ebfa28ccf8
am: d889a0a753
Change-Id: I5ff1d2beda2e36d1d983f893d64672a95f4c2990
|
2016-06-08 18:24:25 +00:00 |
|
Julia Reynolds
|
5431ee2aca
|
Merge \"Handle alarm firing outside of DND period.\" into nyc-dev
am: e1451c4e30
Change-Id: I1b1cbb8c432bcbbbf7713144044831bcb09e4528
|
2016-06-08 18:24:04 +00:00 |
|
Tianjie Xu
|
475171de75
|
Merge \\"Change unit of I/O statistics to MiB\\" into nyc-dev am: 00681d0e78
am: aebec60aa9
Change-Id: Ifb57c33f5cc4c44eef6ffcf34ef3522207c6960d
|
2016-06-08 18:20:31 +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
Change-Id: I34fbe82455b113d2608f64f9220f5a1757e39627
|
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
Change-Id: I934a06f985319d4520044aff7adf4329f0c27953
|
2016-06-08 18:16:40 +00:00 |
|
Tianjie Xu
|
d889a0a753
|
Merge \\"Change unit of I/O statistics to MiB\\" into nyc-dev am: 00681d0e78
am: ebfa28ccf8
Change-Id: I0dcd9c8429146f14725f618573b425d103958838
|
2016-06-08 18:13:56 +00:00 |
|
Sudheer Shanka
|
939efb2f86
|
Merge \\"Disable some QS functionality in retail demo mode.\\" into nyc-mr1-dev am: 31a37ed77f
am: 21d55c332a
Change-Id: Ib051f529a80dbfdbec6067989fc4dae2fb5e22f2
|
2016-06-08 18:09:49 +00:00 |
|
Tianjie Xu
|
aebec60aa9
|
Merge \"Change unit of I/O statistics to MiB\" into nyc-dev
am: 00681d0e78
Change-Id: I14500524ede93f736d8e6b0ddcc71bd2aa709648
|
2016-06-08 18:08:50 +00:00 |
|
Tianjie Xu
|
ebfa28ccf8
|
Merge \"Change unit of I/O statistics to MiB\" into nyc-dev
am: 00681d0e78
Change-Id: I150ccc3c3164ee487bf4c726b080d885f8b39696
|
2016-06-08 18:04:32 +00:00 |
|