Pavel Grafov
274cd0aa55
Merge "Use PROFILE_INACCESSIBLE to track locked profile" into udc-dev am: 5ed0d0ce99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23155128
Change-Id: I0adeb862cdb7aa9356f1e70040a47718ea25dbfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 10:58:33 +00:00
Pavel Grafov
5ed0d0ce99
Merge "Use PROFILE_INACCESSIBLE to track locked profile" into udc-dev
2023-05-12 10:13:41 +00:00
Jerry Chang
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
Jerry Chang
303d6101fb
Merge "Fix not tracking splitting tasks correctly" into udc-dev
2023-05-12 00:49:21 +00:00
Treehugger Robot
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
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
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
Tony Wickham
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
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
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
Sunny Goyal
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
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
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
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
Sunny Goyal
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
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
83cfb28b75
[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: I3189ac3fea1a4b66e19f33f212fcf48b48d28e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 19:19:42 +00:00
Bill Yi
01d51b6ec6
[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: I3680968efe40eb8d7774d56f25306677bced95ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 19:19:32 +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
Pavel Grafov
a3d37c8faa
Use PROFILE_INACCESSIBLE to track locked profile
...
Pre-U ACTION_MANAGED_PROFILE_UNAVAILABLE broadcast meant the user was
shutting down, and could be used to track when the user can be treated
as locked. In Android U work profile in quiet mode remains running, so
to track when the user gets locked this CL swithces to
ACTION_PROFILE_INACCESSIBLE instead, which is sent when the user is shut
down.
+ formatting fix to satisfy lint
Bug: 277715473
Test: manual, with TestDPC and work contact shortcut
Change-Id: I258df006e2d87f69bbbac82d20ad72ddce625425
2023-05-11 17:10:27 +01:00
Thales Lima
79bc256775
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: Id8edb480bde892d247741714ed1bd2b020e89294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 15:28:44 +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
45aa875f1a
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: I3460b81ac7d3c74b9c05f22c8c269b25eaf35c51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 09:06:29 +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
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
TreeHugger Robot
f3a07dd399
[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: I2cd76aa7c1f8a1a3fc602385c3473a8bf386b477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 03:26:52 +00:00
Bill Yi
56fbe9ae6e
[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: I89321b47874db4c40577552cdd9a81217c631fee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 03:26:46 +00:00
TreeHugger Robot
d7c2ad50ad
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0836b02af4 -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: I08f9d8897e87714b5b305c25630d45e6a66c6bda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 02:40:23 +00:00
Bill Yi
20c1ac3b28
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 85f0ac5cbc -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: Ib00ce8a1fb58d40ab5f31e97a6dff8bfb915ba0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 02:40:18 +00:00
TreeHugger Robot
0836b02af4
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-05-11 02:01:07 +00:00
Jagrut Desai
bbcd04ab6e
Merge "Fixing TaplTests" into udc-dev am: 4d559a6c92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23139495
Change-Id: I03643bcaf76ee613a0b114051cd07b9e7dfda898
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:21:05 +00:00
Mady Mellor
6be447b877
Merge "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash" into udc-dev am: 3291bfecf2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22534248
Change-Id: Ieeb3d1f47d1b8f7ffdbd11efc9d0c2379ed98952
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:20:46 +00:00
Jagrut Desai
4d559a6c92
Merge "Fixing TaplTests" into udc-dev
2023-05-10 23:19:39 +00:00
Mady Mellor
3291bfecf2
Merge "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash" into udc-dev
2023-05-10 23:11:42 +00:00
Jagrut Desai
0484a1ac9c
Merge "Remove Screen Record for the test" into udc-dev am: cd86880481
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23142136
Change-Id: Ied8955fa52d30197579aab136198ac899505a16a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:59:04 +00:00
Jagrut Desai
cd86880481
Merge "Remove Screen Record for the test" into udc-dev
2023-05-10 22:19:47 +00:00
Treehugger Robot
f4a9015025
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1a7dcf55ee -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122647
Change-Id: I58dd7ad23b86053568e6965908f5f12dab0a5831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:14:47 +00:00
Bill Yi
655500b6de
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6443e92ce7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122647
Change-Id: If740956c7fc5a3775b01cb0767cede8005b9dcf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:14:45 +00:00
Treehugger Robot
1b2330f1c6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c75783f565 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122646
Change-Id: I22845e72baab8751010b064534d50195b1a6e8c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:14:43 +00:00
Bill Yi
35c802239d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 986a5c9cfd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122646
Change-Id: I6f610e2ef5d945afdb6aa184df74f68a6ee7f1f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:14:26 +00:00