bac40d617d
Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120 am: 4e4da5c95e am: a0231eafa3 am: 620833b727
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443
Change-Id: Ib54ca3d95dfa653d175498e16bb40cae0b9fecbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 02:18:31 +00:00
6d2ab937bc
Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev am: 52d4764576 am: 3b7009bc57 am: 4d5b3e50f6 am: 689bc856eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23177739
Change-Id: I77d4e1c0718bd0238b544ffa9c7b8208bbc611b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 01:51:48 +00:00
dd72e04160
Merge "Fix not tracking splitting tasks correctly" into udc-dev am: 303d6101fb am: 150bf694d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23149642
Change-Id: I144ab73e559924d4fc204d506661dfa2ee854ea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 01:43:47 +00:00
487fc1e2ff
Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120 am: a0db88cee5 am: 0eaf9b0e75 am: f11d62b58b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443
Change-Id: Ifb84174a865f5dad9cb8b7a083f469afe07d260b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 01:07:21 +00:00
150bf694d4
Merge "Fix not tracking splitting tasks correctly" into udc-dev am: 303d6101fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23149642
Change-Id: I1727865114e341f322dd7349c878e1367c9ea748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 01:02:33 +00:00
303d6101fb
Merge "Fix not tracking splitting tasks correctly" into udc-dev
2023-05-12 00:49:21 +00:00
2ba03e8d11
Merge "Add logs to check which userId is used for workProfile matcher" into udc-dev am: e201480e77 am: 06f1b97214
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23174986
Change-Id: Ib13851f91544921d4e54c9b2977195a46401b751
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 00:41:26 +00:00
3e62b41ea3
Merge "Only refresh the launcher resume state when the task launch fails" into udc-dev am: e04071e19c am: 436229450b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23151004
Change-Id: I64d9efcc3af0dcdb2d81d3d3dbd8208cbfa46ddb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 00:41:17 +00:00
c75bd69dbc
Merge "Consistently multiply touch slop for InputConsumers" into udc-dev am: 8d402efac2 am: cfa7876f2a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122637
Change-Id: I0f7894052c65cfa8d7798474da43aa4eefdb445c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 00:38:48 +00:00
06f1b97214
Merge "Add logs to check which userId is used for workProfile matcher" into udc-dev am: e201480e77
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23174986
Change-Id: I4643c76b6511c771e05ee46d22e0117a8a9190e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 00:20:16 +00:00
e201480e77
Merge "Add logs to check which userId is used for workProfile matcher" into udc-dev
2023-05-12 00:07:37 +00:00
436229450b
Merge "Only refresh the launcher resume state when the task launch fails" into udc-dev am: e04071e19c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23151004
Change-Id: If3358102e727d7f58538780c6337ddc9c325f385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 23:59:15 +00:00
cfa7876f2a
Merge "Consistently multiply touch slop for InputConsumers" into udc-dev am: 8d402efac2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122637
Change-Id: Iec7ffcf1962731ad929fc630e860a1931e250c01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 23:58:56 +00:00
6b41662ac8
Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev am: 7158d2d0e2 am: b13f3456cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22146539
Change-Id: I274aa922f51af456ce8b06a857c31f39f8464ded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 23:33:34 +00:00
1758f9db7b
Merge "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""" into udc-dev am: c110587dba am: 396abeecaf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159152
Change-Id: I67919780cb245058f85bb8f048f49c7803f88d57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 23:33:02 +00:00
e04071e19c
Merge "Only refresh the launcher resume state when the task launch fails" into udc-dev
2023-05-11 23:31:21 +00:00
de1b42b957
Only refresh the launcher resume state when the task launch fails
...
- The previous call from TaskbarLauncherStateController caused a
regression due to the inability for the code to distinguish
Normal -> Background -> Normal when tapping on the bar area
or from failing to launch a task, so both cases were triggering
the resumed state to cycle and start an animation. For now we can
only handle the task-launch fail case.
Bug: 268448123
Fixes: 281966662
Test: Quickswitch to an activity that finishes when resumed
Change-Id: Ie4692dd85252540ff47633978c0e6e4adbb1bdd0
2023-05-11 23:31:14 +00:00
8d402efac2
Merge "Consistently multiply touch slop for InputConsumers" into udc-dev
2023-05-11 23:21:33 +00:00
620833b727
Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120 am: 4e4da5c95e am: a0231eafa3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443
Change-Id: I07524861b29c01e095f1930fd5d5404e33f2f58d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 23:15:40 +00:00
689bc856eb
Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev am: 52d4764576 am: 3b7009bc57 am: 4d5b3e50f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23177739
Change-Id: I55df5e452698d50cd56ba67250ed71ac67428bf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 23:14:39 +00:00
f11d62b58b
Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120 am: a0db88cee5 am: 0eaf9b0e75
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443
Change-Id: I63a0ca4a33e9fca71ea3b326ef1a4b9ffced29d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 23:13:02 +00:00
b13f3456cd
Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev am: 7158d2d0e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22146539
Change-Id: Ie52ab1c28b229b6364a3b80ec1eadb0fb0a55b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:56:03 +00:00
396abeecaf
Merge "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""" into udc-dev am: c110587dba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159152
Change-Id: I3612fcd5bbd3da3d665ab591e880a5424865cc90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:53:43 +00:00
c53018d534
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: fa74c1ab70 -s ours am: b456274145 -s ours am: c6761384ab -s ours am: 625032d178 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122645
Change-Id: I7c58b34860b060861a1ae2118b05686df6bfb2a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:38:17 +00:00
1fe80b281d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4952c38e99 -s ours am: b7b9abc978 -s ours am: 28bc032e14 -s ours am: b9272d346e -s ours am: 53989ca148 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122645
Change-Id: I76728a5ea81339bab71020c26af3349d1e626f4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:38:09 +00:00
7158d2d0e2
Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev
2023-05-11 22:31:34 +00:00
a0231eafa3
Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120 am: 4e4da5c95e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443
Change-Id: Id1d6cf3167a74d2d05834bc56486af120abe6966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:31:30 +00:00
4d5b3e50f6
Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev am: 52d4764576 am: 3b7009bc57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23177739
Change-Id: I098af1f09aabf933c56a7c6ae8766afcb16b9b95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:29:40 +00:00
0eaf9b0e75
Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120 am: a0db88cee5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443
Change-Id: I24c07573a1cd1d5b006868945405f18e25412fcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:27:26 +00:00
c110587dba
Merge "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""" into udc-dev
2023-05-11 22:24:45 +00:00
09905cfa90
Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""
...
This reverts commit bca4e694f0
2023-05-11 22:22:16 +00:00
93005695c9
Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev am: 52d4764576 am: 7f51cb5513
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23177739
Change-Id: Ie84e306e7eeca2141c73488539b7345547b25dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:08:09 +00:00
e3cd579e7d
Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120 am: d10d3d9aa4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443
Change-Id: Ia28b795bec507253d35e39096b761367369202ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:05:52 +00:00
88a91bbd16
Add logs to check which userId is used for workProfile matcher
...
Flag: none
Test: compiles
Bug: 243688989
Change-Id: I0a579203cc0c51f7707180b323ed4828f1dea297
2023-05-11 14:55:00 -07:00
3b7009bc57
Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev am: 52d4764576
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23177739
Change-Id: I203a9bc846ff227ac3b64af44395c81dcf6b0375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:50:50 +00:00
a0db88cee5
Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443
Change-Id: I121d0540ffc6a8ec3084162e4c676cfed7e6287f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:50:40 +00:00
4e4da5c95e
Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443
Change-Id: Ie4d576a000eeee5a62cf5c429fcb49a4078a8712
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:44:30 +00:00
1301d15de1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: fa74c1ab70 -s ours am: b5d028d101 -s ours am: 464b1274ca -s ours am: 39d27cb6e3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122645
Change-Id: Ie74a5976a4a8ee65b5778821833b40d8ed275ac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:31:42 +00:00
9122c5e477
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4952c38e99 -s ours am: b7b9abc978 -s ours am: 6a90c39ab3 -s ours am: 83fedff404 -s ours am: 3ffd4d922e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122645
Change-Id: I6e26c680717057567a3eb8284dfeb2972528de89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:31:33 +00:00
7f51cb5513
Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev am: 52d4764576
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23177739
Change-Id: I36e6ccc498b5cd64239820ad0f144afe586730f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:28:30 +00:00
afe096a18c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: fa74c1ab70 -s ours am: b456274145 -s ours am: 25969501e8 -s ours am: 89b7b099fe -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122645
Change-Id: I0666377483b58d4d1a1c6411287de8bb66aa8a29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:28:02 +00:00
6dd5a9e517
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4952c38e99 -s ours am: b7b9abc978 -s ours am: 28bc032e14 -s ours am: 80ed083789 -s ours am: 42b1a3e96e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122645
Change-Id: I1bba57434559abb6c875d9e0a38b93a858a8e59d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:27:52 +00:00
0bc85a06b6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: f8ff957ed5 -s ours am: 9d002f062f -s ours am: e89475f51b -s ours am: 923a2e5753 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122645
Change-Id: I68fc48667ef9dc78a23ef95701436076b1f92545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:27:36 +00:00
d10d3d9aa4
Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443
Change-Id: I002f424a0e367b53c4bac4cdae53a4735fc3e2bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:26:59 +00:00
52d4764576
Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev
2023-05-11 20:58:02 +00:00
c258d8c5d3
Merge changes from topic "tc_change_2305100725_41" into tm-qpr-dev-plus-aosp am: 37f938129a am: d004e85381 am: 6aa7b09abf am: 0c76bf7370
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122645
Change-Id: I3e9533ccb8851a03d8a4fd323d177d55a584f9be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:43:31 +00:00
625032d178
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: fa74c1ab70 -s ours am: b456274145 -s ours am: c6761384ab -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122645
Change-Id: I33442be6d770378b1eeee8cbb9ed5fb4a6199633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:40:11 +00:00
53989ca148
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4952c38e99 -s ours am: b7b9abc978 -s ours am: 28bc032e14 -s ours am: b9272d346e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122645
Change-Id: I6bec521371c06b8fbabcc5ccb9307854c536c80e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:40:02 +00:00
04a6211120
Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev
2023-05-11 20:22:51 +00:00
39d27cb6e3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: fa74c1ab70 -s ours am: b5d028d101 -s ours am: 464b1274ca -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122645
Change-Id: I8e4beca4472f95d96e633ac48f558593fda9a43c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:09:53 +00:00
Sunny Goyal
Treehugger Robot
Jerry Chang
Winson Chung
Tony Wickham
Jeremy Sim
Bill Yi
Vinit Nayak