Commit Graph

61189 Commits

Author SHA1 Message Date
Android Build Coastguard Worker ffb3fcfb25 Snap for 10120310 from ebc1cea517 to udc-qpr1-release
Change-Id: Ic7aee9c309cffd699ab446664a379d55c26d3284
2023-05-12 03:26:45 +00:00
Jerry Chang ebc1cea517 Merge "Fix not tracking splitting tasks correctly" into udc-dev am: 303d6101fb am: d7a75e5b9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23149642

Change-Id: Id35db79cfa5597d8a3f190ac96dfc44ce51d06aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 01:47:08 +00:00
Jerry Chang d7a75e5b9e 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: Ie7f59ef4c30dcb6275735e4d34c6d9f83ecc0876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 01:02:39 +00:00
Jerry Chang 303d6101fb Merge "Fix not tracking splitting tasks correctly" into udc-dev 2023-05-12 00:49:21 +00:00
Treehugger Robot 99dab78a0e Merge "Add logs to check which userId is used for workProfile matcher" into udc-dev am: e201480e77 am: 6dcf6f0e42
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23174986

Change-Id: Ib6334ff398c49f983186323fb27668486de7cfbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:43:52 +00:00
Winson Chung 03e384c3b4 Merge "Only refresh the launcher resume state when the task launch fails" into udc-dev am: e04071e19c am: 485267061f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23151004

Change-Id: Ida864ed458f2e27b1455530b6094628852de02cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:43:46 +00:00
Tony Wickham deb445d480 Merge "Consistently multiply touch slop for InputConsumers" into udc-dev am: 8d402efac2 am: bb176e243a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122637

Change-Id: I2cbe2698d291474ce3c1822535a9fe1a5d34d2be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:42:06 +00:00
Treehugger Robot 6dcf6f0e42 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: I09cff1e8be14c47fbe4e6d1457334d69d4675531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:22:52 +00:00
Treehugger Robot e201480e77 Merge "Add logs to check which userId is used for workProfile matcher" into udc-dev 2023-05-12 00:07:37 +00:00
Winson Chung 485267061f 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: I4cb69a140791bceeed78a24bbc43be0a70d1e142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:00:45 +00:00
Tony Wickham bb176e243a 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: I0ea3bef525d76dd8801e66d2e35334b39b66e6cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:58:27 +00:00
Jeremy Sim 3d7ea7aa22 Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev am: 7158d2d0e2 am: 37c9f10a26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22146539

Change-Id: I355dcde40d6fcbd6bec6fdd3ef36a09b2dbbf722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:34:28 +00:00
Sunny Goyal 38ccd68d92 Merge "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""" into udc-dev am: c110587dba am: 71d20b0ed7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159152

Change-Id: I5b35a96ec61daf3991d0158069fdc992fe4e7dc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:34:16 +00:00
Winson Chung e04071e19c Merge "Only refresh the launcher resume state when the task launch fails" into udc-dev 2023-05-11 23:31:21 +00:00
Winson Chung 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
Tony Wickham 8d402efac2 Merge "Consistently multiply touch slop for InputConsumers" into udc-dev 2023-05-11 23:21:33 +00:00
Jeremy Sim 37c9f10a26 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: Ie1a029935d313dd87ad663db298c04aa815f7d46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:55:23 +00:00
Sunny Goyal 71d20b0ed7 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: I3dc4f94a4dc8a9eb00044e23742add37120ed195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:53:34 +00:00
Treehugger Robot eb288b9a78 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: Ia96987dcbeb7aa2223ccc1b8455d6c2abb8da55d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:33:47 +00:00
Jeremy Sim 7158d2d0e2 Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev 2023-05-11 22:31:34 +00:00
Sunny Goyal eed29d5b49 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: Iff569b1d6215e2b080517bedd07de037765a4d09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:31:17 +00:00
Sunny Goyal c110587dba Merge "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""" into udc-dev 2023-05-11 22:24:45 +00:00
Sunny Goyal 09905cfa90 Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""
This reverts commit bca4e694f0.

Reason for revert: post submit broken

Change-Id: I8afc63b5aa67ee14127f79e2245ef543bff8cf31
2023-05-11 22:22:16 +00:00
Vinit Nayak 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
Treehugger Robot 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
Sunny Goyal 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
Treehugger Robot 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
Sunny Goyal 04a6211120 Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev 2023-05-11 20:22:51 +00:00
Treehugger Robot 25969501e8 [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 skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122645

Change-Id: I7b81b42ad76f5bfb68d1212c7f0bb4fdf84e008a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:40:58 +00:00
Bill Yi 80ed083789 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4952c38e99 -s ours am: b7b9abc978 -s ours am: 28bc032e14 -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: I955b00138f93f3e4ff475e9eb086c89acf00732e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:40:49 +00:00
Treehugger Robot b456274145 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: fa74c1ab70 -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: Ic5b132cbac8c7daa4c13f8c444c3897bad1bfc5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:11:37 +00:00
Bill Yi 28bc032e14 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4952c38e99 -s ours am: b7b9abc978 -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: I5f15bb598c74e405f3bb47ee981bceb97522c0e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:11:27 +00:00
Treehugger Robot fa74c1ab70 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -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: Ic9a41c6c841cf1c3f20cfdb0f3c2e7128cf0fb14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:05:24 +00:00
Bill Yi b7b9abc978 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4952c38e99 -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: I78de3e9041c1e246f24d079b1240555bd10046f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:05:14 +00:00
Mady Mellor 662787540c Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"
This reverts commit 7344766886.

Reason for revert: b/282035015

Change-Id: I38db287f730048d3e1e5041f1853bdae214e1a66
2023-05-11 18:50:35 +00:00
Treehugger Robot 674ef91120 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-05-11 18:29:23 +00:00
Thales Lima 354d7d1398 Merge "Make taskbar touchable region smaller in Overview" into udc-dev am: fda9f3d430 am: eb257ed316
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22995656

Change-Id: I2cb5c4d764368526e39fc722513a6d28c8a8d3d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 16:10:32 +00:00
Thales Lima eb257ed316 Merge "Make taskbar touchable region smaller in Overview" into udc-dev am: fda9f3d430
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22995656

Change-Id: Ifa031dda3a4e2625a686551d16f31a9b18080f8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 15:28:55 +00:00
Thales Lima fda9f3d430 Merge "Make taskbar touchable region smaller in Overview" into udc-dev 2023-05-11 14:48:18 +00:00
Thales Lima 3bc763f5a3 Make taskbar touchable region smaller in Overview
While in overview, makes the touchable region smaller so touches can go to the window below and trigger tapping on overview to go home.

Bug: 269985301
Test: Manual (TAPL in a following CL)
Flag: none
Change-Id: Ie8c7719090c387f951d78cf0fc47e6d9ed192f27
2023-05-11 14:45:41 +00:00
Jerry Chang a126703c72 Defer intercepting touch events to actually start shifting tasks am: 2792271688 am: 3f22947439
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23163166

Change-Id: Ic0c70580a157a2794279cc1124e2b3f5c13b21cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 09:50:16 +00:00
Jerry Chang 3f22947439 Defer intercepting touch events to actually start shifting tasks am: 2792271688
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23163166

Change-Id: I0b75fee0ee75573a37517ff94b7b4ff33fe3b62a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 09:06:55 +00:00
Jerry Chang 87ed2f1176 Fix not tracking splitting tasks correctly
When drag-to-repace one of the splitting tasks, it might reports to
TopTaskTracker the original task changed to undefined after repoting the
new task appeared in a split pair. Result to clear the split tasks
record unexpectedly in TopTaskTracker. This makes sure to clear the
correct stage and prevent override the correct split record.

Fix: 277982233
Test: manual check the behavior and verify the reocrd in TopTaskTracker
Change-Id: Ifce2efdde6d99508f1afa844b3ad424071e13a8f
2023-05-11 08:53:23 +00:00
Jerry Chang 2792271688 Defer intercepting touch events to actually start shifting tasks
Fix: 278740578
Test: http://recall/-/fLARJNt42LVxc3tt86SneW/d9A443iE2UQVktVc2YqwT2
Change-Id: I81efc87f19775dba96bab581a1c443d6070f6ebc
2023-05-11 05:44:16 +00:00
TreeHugger Robot a937403ee7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0836b02af4 -s ours am: d7c2ad50ad -s ours am: 8f29cbc727 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23123110

Change-Id: I7332b704d5392bf9d7cde709f733a47f6585a7c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 04:10:50 +00:00
Bill Yi 1723153793 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 85f0ac5cbc -s ours am: 20c1ac3b28 -s ours am: 11e65fa78b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23123110

Change-Id: If67917a3c2103eee0f92fe0ab9875c1de3aab335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 04:10:43 +00:00
Tony Wickham 233ab99093 Consistently multiply touch slop for InputConsumers
Fixes: 268651129
Test: TaplTestsQuickstep; manually swipe up from various InputConsumers
Change-Id: I0a3baf654092a1a0bdafbfc734ec394668ba60f6
2023-05-11 03:33:57 +00:00
Android Build Coastguard Worker 3f0c1d1cfd Snap for 10109327 from b91d216bb6 to udc-qpr1-release
Change-Id: I3d6831bce47e5ca2142da96cc0b62466f409deb2
2023-05-11 03:26:30 +00:00
TreeHugger Robot 8f29cbc727 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0836b02af4 -s ours am: d7c2ad50ad -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23123110

Change-Id: Ia3b6eb57346e53e3d04412f39462f9278e12bb8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 03:26:16 +00:00
Bill Yi 11e65fa78b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 85f0ac5cbc -s ours am: 20c1ac3b28 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23123110

Change-Id: I47d8c19695324b03ce351818753d772ca8e69fc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 03:26:10 +00:00