c099124ecf
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e am: 29c4e7949b am: 462f9fe0ad am: c6b1e463a2 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia7ed25684b708209f531a908497d697a5f9bd05f
2020-03-21 03:55:02 +00:00
c2f26c2a67
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e am: 0869bbf43d am: acad4f578b am: e43dedab9d -s ours
...
am skip reason: subject contains skip directive
Change-Id: I4b98d69c6652527ffb1834f20d68fd8063c6031a
2020-03-21 03:54:56 +00:00
c6b1e463a2
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e am: 29c4e7949b am: 462f9fe0ad
...
Change-Id: I099b9c615f351aa6584fa647e0636b51e203cee1
2020-03-21 03:30:22 +00:00
e43dedab9d
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e am: 0869bbf43d am: acad4f578b
...
Change-Id: Ib495a1bca3192dbe0ca8fd00ca5c01d65dca2c6b
2020-03-21 03:30:01 +00:00
462f9fe0ad
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e am: 29c4e7949b
...
Change-Id: I057a073622a0c5a19ea8e7b822930cfb51e90a19
2020-03-21 03:13:14 +00:00
acad4f578b
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e am: 0869bbf43d
...
Change-Id: I2e92d3cacee2c3e2845e35401e60b6aee97ed41b
2020-03-21 03:12:51 +00:00
29c4e7949b
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e
...
Change-Id: Ibe2b0b5318210959e19de141c15dbc3926cbcd91
2020-03-21 02:59:45 +00:00
0869bbf43d
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e
...
Change-Id: I73c712c430d87d9998af657ede1dd94976a27c4f
2020-03-21 02:59:01 +00:00
6b516bd63e
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic81a7691c525dfefa0a144364953c20aede0a65c
2020-03-21 02:41:11 +00:00
985639b823
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: bc2c965574 -s ours am: 506335de19 am: 69afb6b861 am: a815250b76 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ifa7b6ec57c327f47b6007fcbe32299be00e12780
2020-03-20 23:24:29 +00:00
a815250b76
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: bc2c965574 -s ours am: 506335de19 am: 69afb6b861
...
Change-Id: I917fde089ee793ae089d6a8d5a99375bfb80bc15
2020-03-20 22:33:36 +00:00
3b5f2224c6
[DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims
...
Add wallpaper changed broadcast receiver to BaseDragLayer, which
checks if the new wallpaper is blacklisted and relays that to
remove the scrims.
Bug: 150144115
Change-Id: I55b7b98fdd419cd76532492461a872367efed67b
(cherry picked from commit d6f917f182
2020-03-20 21:56:18 +00:00
2a85b04ffd
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: c0eb6269c6 am: 2ddbe4c8af am: f7eb87cebd am: 66c4207b8a
...
Change-Id: I3a48e09dd8e6a86b201c2f683c4a7c209fe6ac81
2020-03-20 18:48:12 +00:00
14754e6e3a
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: c0eb6269c6 am: 4beb9d1338 am: 70ad7790e6
...
Change-Id: I853022e8ebfba9724d544beb795560757be7281c
2020-03-20 18:45:50 +00:00
69afb6b861
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: bc2c965574 -s ours am: 506335de19
...
Change-Id: Ia1c0e46ad6a624365dfeaff5788012dae31d7819
2020-03-20 18:45:17 +00:00
8bf64ae28a
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: b9958da552 am: d214ae4643 am: d90db91522
...
Change-Id: I11ae95de8143b7e90badf4ac222af2a113df5234
2020-03-20 18:45:16 +00:00
66c4207b8a
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: c0eb6269c6 am: 2ddbe4c8af am: f7eb87cebd
...
Change-Id: I30ad926d5c45cdcb2ddae32e67e4b5c0cd561884
2020-03-20 18:42:47 +00:00
70ad7790e6
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: c0eb6269c6 am: 4beb9d1338
...
Change-Id: I7cbc274cbe3bacd568223977556641488deea834
2020-03-20 18:32:53 +00:00
d90db91522
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: b9958da552 am: d214ae4643
...
Change-Id: Iec2591a4dbea777d892de8d46f6835e988921a10
2020-03-20 18:32:39 +00:00
506335de19
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: bc2c965574 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I684255cf8384fb3ab8707af5f05639444f75c617
2020-03-20 18:31:52 +00:00
f7eb87cebd
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: c0eb6269c6 am: 2ddbe4c8af
...
Change-Id: I904a49d3149f6388a4906a853eb507eda5af6abb
2020-03-20 18:30:25 +00:00
2ddbe4c8af
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: c0eb6269c6
...
Change-Id: I9efeb5bdcf7d4d6cfd0070a2de69f0f73b54b4ad
2020-03-20 18:27:37 +00:00
4beb9d1338
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: c0eb6269c6
...
Change-Id: Ieb85555c9cbe4992c1e5f5a2c6a1438f3ad6b291
2020-03-20 18:27:33 +00:00
d214ae4643
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: b9958da552
...
Change-Id: If293e615a3e7038668b3134f22694b576e809e55
2020-03-20 18:27:21 +00:00
c0eb6269c6
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64
...
Change-Id: I137a818d432a69180087e2895daccc65e7a97daa
2020-03-20 18:26:09 +00:00
b9958da552
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64
...
Change-Id: Ie7fb82c4def54620b2ca22714a7fa83a2afe515e
2020-03-20 18:22:26 +00:00
39cbf97f64
Merge "Update window threshold in both directions" into rvc-dev
2020-03-20 18:20:15 +00:00
7d020f7da1
Update window threshold in both directions
...
- Only use the task flags when we should be using the home screen state
Bug: 151181674
Test: Move gesture below threshold and observe split minimize
Change-Id: I1b0f682eb9c2861b36953da7695c798c187db517
2020-03-19 19:40:39 -07:00
a9aaeac3e0
Merge "Import translations. DO NOT MERGE"
2020-03-19 23:25:51 +00:00
40b06ae1a6
[automerger skipped] Import translations. DO NOT MERGE am: e19a23a7ff -s ours am: d261f80c30 -s ours am: 32f6b1a66d -s ours am: a8bd501e9f -s ours am: 141c8bf38b -s ours
...
am skip reason: subject contains skip directive
Change-Id: I49fa1823e94b4aba14029fbf4398e77acaa54511
2020-03-19 20:32:19 +00:00
bd34e6415d
[automerger skipped] Import translations. DO NOT MERGE am: e19a23a7ff -s ours am: 9b25ccdb41 -s ours am: e7189e0f7a -s ours am: 8b8c3b0672 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ief855c310bee77ea34dbcb5c1ddb575a203e2c45
2020-03-19 20:31:48 +00:00
d8e1044e93
[automerger skipped] Import translations. DO NOT MERGE am: e19a23a7ff -s ours am: d261f80c30 -s ours am: 7e82134093 -s ours am: d364007862 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2f71b4e21879156e609d01f1b49b20dfb848123c
2020-03-19 20:31:06 +00:00
141c8bf38b
[automerger skipped] Import translations. DO NOT MERGE am: e19a23a7ff -s ours am: d261f80c30 -s ours am: 32f6b1a66d -s ours am: a8bd501e9f -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic1b70c382ee5becd505bc10fd46c37a27d402a20
2020-03-19 20:29:42 +00:00
a8bd501e9f
[automerger skipped] Import translations. DO NOT MERGE am: e19a23a7ff -s ours am: d261f80c30 -s ours am: 32f6b1a66d -s ours
...
am skip reason: subject contains skip directive
Change-Id: I3abbb0e166dc6b0a5b9562b72842c2c1bfff147e
2020-03-19 20:17:37 +00:00
8b8c3b0672
[automerger skipped] Import translations. DO NOT MERGE am: e19a23a7ff -s ours am: 9b25ccdb41 -s ours am: e7189e0f7a -s ours
...
am skip reason: subject contains skip directive
Change-Id: I972c6a9d156a311bcaa668f429374ee3bdb9a32f
2020-03-19 20:17:28 +00:00
d364007862
[automerger skipped] Import translations. DO NOT MERGE am: e19a23a7ff -s ours am: d261f80c30 -s ours am: 7e82134093 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic5ed489764cb4991519d21a08107a160f4bdd339
2020-03-19 20:16:29 +00:00
e7189e0f7a
[automerger skipped] Import translations. DO NOT MERGE am: e19a23a7ff -s ours am: 9b25ccdb41 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ice41350cb89ae2e06f3fd5045681686e8ccbdd5e
2020-03-19 19:48:19 +00:00
32f6b1a66d
[automerger skipped] Import translations. DO NOT MERGE am: e19a23a7ff -s ours am: d261f80c30 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id9c8e87b1a657493d975d89834d09e62b182be26
2020-03-19 19:42:03 +00:00
7e82134093
[automerger skipped] Import translations. DO NOT MERGE am: e19a23a7ff -s ours am: d261f80c30 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Iead8c99b026c7e9d8fed8b8b830489cd5f7c77d3
2020-03-19 19:41:22 +00:00
9b25ccdb41
[automerger skipped] Import translations. DO NOT MERGE am: e19a23a7ff -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2b770a62d31933eaefa9c2c4152f63bccf94ada1
2020-03-19 19:24:57 +00:00
d261f80c30
[automerger skipped] Import translations. DO NOT MERGE am: e19a23a7ff -s ours
...
am skip reason: subject contains skip directive
Change-Id: I62b2546a5e29146d44b14d07839cd95985e73756
2020-03-19 19:24:16 +00:00
bc2c965574
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master
...
Bug: 151763422
Change-Id: Id9cc5ab3703524a32092b2ed815101713fd76731
2020-03-19 10:10:41 -07:00
ca4f2e81fa
Import translations. DO NOT MERGE
...
BUG: 151750123
Auto-generated-cl: translation import
Change-Id: I5c7e8ffccb7830d2159bfe0de0d35fe011938e74
2020-03-19 15:55:00 +00:00
e19a23a7ff
Import translations. DO NOT MERGE
...
BUG: 151750123
Auto-generated-cl: translation import
Change-Id: I5c7e8ffccb7830d2159bfe0de0d35fe011938e74
2020-03-19 15:54:33 +00:00
623b2a4521
Merge "Final strings for work profile and hybrid hotseat" into rvc-dev am: 77a1c8eefc am: 4b2782b07e am: e0d5992c70 am: 9ea702ebf9 am: 64c5b0e5e6
...
Change-Id: Ifcb5421db34b947451e9474149abc07518e29ce9
2020-03-19 09:52:28 +00:00
29bed16e87
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: b4197095a3 -s ours am: f82a40ce47 -s ours am: 45b0fd7969 -s ours am: 2eb1e5c42a -s ours am: 889e1b3ecb -s ours am: 871d000136 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I626b7b75f2cf476eeb9fb331cb7c464bf6abdb92
2020-03-19 09:52:21 +00:00
64c5b0e5e6
Merge "Final strings for work profile and hybrid hotseat" into rvc-dev am: 77a1c8eefc am: 4b2782b07e am: e0d5992c70 am: 9ea702ebf9
...
Change-Id: I6d7d46c75ebeed9d872fca7436747e066c2f22f7
2020-03-19 09:52:16 +00:00
66e62e5c12
Merge "Final strings for work profile and hybrid hotseat" into rvc-dev am: 77a1c8eefc am: 80ac4eea82 am: a4d499f67e am: 7a665e44a0
...
Change-Id: Iec4d3bad5bb52cb7560dd5107e45c86a75ffdc33
2020-03-19 09:52:14 +00:00
23269b2425
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: b4197095a3 -s ours am: f82a40ce47 -s ours am: 46b8242ff0 -s ours am: dca9655145 -s ours am: b9ccf26280 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I4c20ec96c2370119bb5dfb205cadfc39fd2011ce
2020-03-19 09:52:08 +00:00
871d000136
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: b4197095a3 -s ours am: f82a40ce47 -s ours am: 45b0fd7969 -s ours am: 2eb1e5c42a -s ours am: 889e1b3ecb -s ours
...
am skip reason: subject contains skip directive
Change-Id: Iddb1f9a8d8f27dcd8f5424e47df737a9b0c8d6ee
2020-03-19 09:52:07 +00:00
Tony Wickham
Xin Li
Evan Rosky
Winson Chung
Bill Yi
Samuel Fufa
TreeHugger Robot