dc5f90e7dd
Merge "Add flag that disables depth on overlay scroll" into tm-dev am: 8c65675382 am: ac1d0b7089 am: abea3bd0cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17766312
Change-Id: I30ad3f77a855964c54a1b5ae80502667552ffada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 00:19:00 +00:00
157ff20c40
Merge "Improving folder icon drawable" into tm-dev am: 2248d74666 am: f88d280061
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17664075
Change-Id: I705a13fdfea9eb8ab9932e763c1be8224c61a37c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 23:58:13 +00:00
01de6eef5f
Merge "Improving folder icon drawable" into tm-dev am: 2248d74666 am: 7805d8a5d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17664075
Change-Id: I8e0c39e834823c44895c0d333cf9950c6bc60d26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 23:58:12 +00:00
83211ae6fc
Merge "Add flag that disables depth on overlay scroll" into tm-dev am: 8c65675382 am: cb5711fff8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17766312
Change-Id: Iec6280061b379661b8dc41de1c9b016d99cadeef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 23:58:04 +00:00
abea3bd0cd
Merge "Add flag that disables depth on overlay scroll" into tm-dev am: 8c65675382 am: ac1d0b7089
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17766312
Change-Id: Id36a98777f2067abbc285ef5013c139af1f9bbe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 23:57:27 +00:00
645af0a6b3
Revert "fix broken build on erorrprone"
...
Revert submission 17730702-fixErrorProneBuild
Reason for revert: Breaks Launcher3 unbundled build by using hidden library in main Launcher code
Reverted Changes:
Id0ce4d308:Change version checks to use SdkLevel.isAtLeast*
I8fc801b00:fix broken build on erorrprone
Change-Id: Ib1cd50a746bad3b6fb9fbd455a7cdce30f341d8b
2022-04-14 16:54:07 -07:00
f88d280061
Merge "Improving folder icon drawable" into tm-dev am: 2248d74666
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17664075
Change-Id: I924952cab4ae79ec45c3f021d9ca0ba4f5239c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 23:41:10 +00:00
7805d8a5d8
Merge "Improving folder icon drawable" into tm-dev am: 2248d74666
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17664075
Change-Id: Id14991fa72063a079d3a61c10d6d063bc99d4a50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 23:40:50 +00:00
2248d74666
Merge "Improving folder icon drawable" into tm-dev
2022-04-14 23:35:05 +00:00
ac1d0b7089
Merge "Add flag that disables depth on overlay scroll" into tm-dev am: 8c65675382
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17766312
Change-Id: Id951c79d8a00f2058f436451ca833fd61b03efef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 23:34:50 +00:00
cb5711fff8
Merge "Add flag that disables depth on overlay scroll" into tm-dev am: 8c65675382
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17766312
Change-Id: I64895bdc163c192d122d52003fe540614267ba37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 23:33:52 +00:00
8c65675382
Merge "Add flag that disables depth on overlay scroll" into tm-dev
2022-04-14 23:16:20 +00:00
2604dd348c
Move Taskbar background drawing to TaskbarBackgroundRenderer
...
Currently used by both TaskbarDragLayer and TaskbarScrimView
Test: stash and unstash taskbar, background drawn as before; open a
Bubble and ensure taskbar is still scrimmed
Bug: 225200928
Change-Id: I3f7f4c1b1232b53c3eacb0e000d1c3aec25bb49d
2022-04-14 14:18:35 -07:00
9fd1930799
Merge "Prevent double selection of second split app" into tm-dev am: 998c47e594 am: 726c49e77c am: cb4ba9fe73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17622348
Change-Id: Ib24f6e200153ebd163dcca6eb9ba26b9944be3b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 21:08:46 +00:00
4d90868075
Add flag that disables depth on overlay scroll
...
Test: manual
Fixes: 229261804
Change-Id: I132d9b5ca78255447ca72655b0a1fb1a4f86c3a1
2022-04-14 14:06:11 -07:00
28076f3d0a
Merge "Updating code due to TaskStackChangeListener changes" into tm-dev am: bc25ec02a2 am: c03a5a6e80 am: 14fc91ff3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730696
Change-Id: I9fea638ac1edd6271c7026ef686eda1906637e85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 21:04:40 +00:00
013a8a75ab
Removing AM.getTasks call on UI thread during touch down
...
We maintain a cached task queue using TaskStackChangeListener.
It keeps the top RunningTaskInfo partially in sync with platfrom:
taskInfo is only initialized when the top task changes
but not when there are changes within the task itself.
Bug: 214581894
Bug: 220742398
Test: Manual and presubmit
Change-Id: Ifafde574040c03435b78f044350c45f3b49c4bcb
2022-04-14 14:02:28 -07:00
9d28c76381
Merge "Prevent double selection of second split app" into tm-dev am: 998c47e594 am: 9f23ee5c6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17622348
Change-Id: Ibc5f08fb6f3fe053fe1c7f833f90e7e709f66c2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 21:02:27 +00:00
cb4ba9fe73
Merge "Prevent double selection of second split app" into tm-dev am: 998c47e594 am: 726c49e77c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17622348
Change-Id: I815795ea8b0c589189ab98da3319f73af16fe446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 20:46:34 +00:00
14fc91ff3e
Merge "Updating code due to TaskStackChangeListener changes" into tm-dev am: bc25ec02a2 am: c03a5a6e80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730696
Change-Id: Ic4862c56d9ea47bfde93ec033cf768edd1f6c434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 20:45:28 +00:00
726c49e77c
Merge "Prevent double selection of second split app" into tm-dev am: 998c47e594
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17622348
Change-Id: I35004afb26a3133e0789722ed2d8643a51a82012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 20:44:14 +00:00
9f23ee5c6f
Merge "Prevent double selection of second split app" into tm-dev am: 998c47e594
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17622348
Change-Id: Ib5a1ab413bd8490ba4a3115f9c4d2fa2131aa83a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 20:43:38 +00:00
2a1bfcad55
Merge "Updating code due to TaskStackChangeListener changes" into tm-dev am: bc25ec02a2 am: e07dac97ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730696
Change-Id: I3610019091947de5de1cf5e80076a7cfab106579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 20:30:29 +00:00
c03a5a6e80
Merge "Updating code due to TaskStackChangeListener changes" into tm-dev am: bc25ec02a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730696
Change-Id: I2cb0a6148e225319f5b9ef187eef68fe1cf7d802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 20:15:51 +00:00
e07dac97ce
Merge "Updating code due to TaskStackChangeListener changes" into tm-dev am: bc25ec02a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730696
Change-Id: I6e42e7159bafdd8aee8814c7f0eb1d82d075a485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 20:15:00 +00:00
998c47e594
Merge "Prevent double selection of second split app" into tm-dev
2022-04-14 20:13:59 +00:00
bc25ec02a2
Merge "Updating code due to TaskStackChangeListener changes" into tm-dev
2022-04-14 20:11:58 +00:00
23efa9de82
Merge "Showing alert dialog when shortcut version higher than the App" into tm-dev am: af91920955 am: f8a6c58e0d am: 4140547827
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17538946
Change-Id: I07a61dda03698de57dac398a6580fcf54bafa0d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 20:09:19 +00:00
fc9ef4e273
Merge "Showing alert dialog when shortcut version higher than the App" into tm-dev am: af91920955 am: d703ce5926
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17538946
Change-Id: I3ba1db8b4e3b6fb92b60b0bb6fe9073fc4ff28c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 20:08:38 +00:00
4140547827
Merge "Showing alert dialog when shortcut version higher than the App" into tm-dev am: af91920955 am: f8a6c58e0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17538946
Change-Id: I9c7da7281d1c091b767f3e472ace780094510524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 19:50:20 +00:00
f8a6c58e0d
Merge "Showing alert dialog when shortcut version higher than the App" into tm-dev am: af91920955
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17538946
Change-Id: Ic7459ffa871e7cea568f4d6be0992dd7a16f085b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 19:28:23 +00:00
d703ce5926
Merge "Showing alert dialog when shortcut version higher than the App" into tm-dev am: af91920955
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17538946
Change-Id: Ibd3e621fa7d39b17c8a030509f335feab8ba2207
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 19:24:50 +00:00
acaa4c409f
Merge "fix broken build on erorrprone" into tm-dev am: ad90ded7bc am: 1ff6d5fd4e am: ab1891e213
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730702
Change-Id: I3dec41c610ffc6e25cb787ae4de020eb569aca54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:42:41 +00:00
5cc605ce2b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f78ff2b90d -s ours am: c19ce4bf3e -s ours am: 47633c9c3f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716019
Change-Id: I66a365b80f716c1f10b013fd9556d37b88cb0968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:42:28 +00:00
a6a108b9ff
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 05e2272138 -s ours am: e635744297 -s ours am: 4f3656b607 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716019
Change-Id: If9be37ce330a9ca36ed8feb2b498f69378d6db3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:42:27 +00:00
d0f5b82c99
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4918b0245b -s ours am: 9e7bb1c523 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716022
Change-Id: I22c3cc22123a582a6c4a3a27f16b0fdc7df9ecaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:42:19 +00:00
923b63cc20
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c5f5f9c52e -s ours am: d60f59b1c1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716022
Change-Id: If97f19a870b5ecde04afaf9ddb373ed556f47e6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:42:18 +00:00
e57593a327
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4561a37a72 -s ours am: d6e20e17fe -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716402
Change-Id: Ib841f0dc8b7c981a7cf08483ddaa04b8f1dcf2c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:42:10 +00:00
ae9ebcf943
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 50594a6a1b -s ours am: 161cf15b59 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716402
Change-Id: I1f5533d7fbb766fc2ec91883c12b7b996de67908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:42:08 +00:00
98be8507f4
Merge "fix broken build on erorrprone" into tm-dev am: ad90ded7bc am: 45ba0824ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730702
Change-Id: I9060a67388dbe5c8043942ce4b6f5c132c757fc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:29:02 +00:00
af91920955
Merge "Showing alert dialog when shortcut version higher than the App" into tm-dev
2022-04-14 18:26:10 +00:00
3423e6e713
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f78ff2b90d -s ours am: 7488ad9baf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716019
Change-Id: I616a42144feb2d959ed5475a4a77cfbd6522aa3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:24:21 +00:00
67a628e7b5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 05e2272138 -s ours am: 4f1b028cd4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716019
Change-Id: Ie14cec9661df2b7897bca4a85c19f41e541965ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:24:19 +00:00
ab1891e213
Merge "fix broken build on erorrprone" into tm-dev am: ad90ded7bc am: 1ff6d5fd4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730702
Change-Id: I161d2c16d738cbdacec0981dbda7a17101713e28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:14:06 +00:00
47633c9c3f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f78ff2b90d -s ours am: c19ce4bf3e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716019
Change-Id: I5903064b4aa676dd602d4e24327c5a69235dbfca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:13:12 +00:00
4f3656b607
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 05e2272138 -s ours am: e635744297 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716019
Change-Id: Iaa6ac651512ec85eeea0ba738cd8f285762153b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:13:11 +00:00
9e7bb1c523
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4918b0245b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716022
Change-Id: I756d0cd4cfcb607455a85c8483a8e4f117e26551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:12:29 +00:00
d60f59b1c1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c5f5f9c52e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716022
Change-Id: I376eb8abd8e50b74eb9ec1518d95664c6c7539ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:12:27 +00:00
45ba0824ca
Merge "fix broken build on erorrprone" into tm-dev am: ad90ded7bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730702
Change-Id: I597f3c261b369ae0eee11845ef4da7e833e90ec7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:08:09 +00:00
a4e5a9eebe
Prevent double selection of second split app
...
* Also fix small other bug where we were
checking only for LauncherState
OVERVIEW_SPLIT_SELECT and not for equivalent
3P RecentsState
Fixes: 227419997
Test: Repro steps don't cause bug. Yay.
Change-Id: Ibb8238185b959d22d8455b6812d29b2e268d9739
2022-04-14 11:06:47 -07:00
TreeHugger Robot
Sunny Goyal
Tony Wickham
Lucas Dupin
Sihua Ma
Jonathan Scott
Bill Yi
Vinit Nayak