e213e604bd
Merge "Force Taskbar to remain stashed when in 3p launcher or recents" into udc-dev am: d27b06f500
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22961525
Change-Id: I45a54f3694f00f7b84c392cb01bfc362ebade435
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:18:43 +00:00
b4e245466b
Merge "[Talkback] Focus on "Widget" header when widget bottom sheet is opened" into udc-dev am: aab6875746
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23126920
Change-Id: I7019596fe7ef7e1ceeb2d9d55af89d90980681df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:18:33 +00:00
9ac9c98286
Merge "Fix UI issues of fake task view in gesture nav tutorial." into udc-dev am: 24aec5e6b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23120959
Change-Id: Ia900cae2b1da86ccfb829a90d287eb383ed72713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:18:12 +00:00
d27b06f500
Merge "Force Taskbar to remain stashed when in 3p launcher or recents" into udc-dev
2023-05-12 22:08:51 +00:00
aab6875746
Merge "[Talkback] Focus on "Widget" header when widget bottom sheet is opened" into udc-dev
2023-05-12 21:46:14 +00:00
24aec5e6b0
Merge "Fix UI issues of fake task view in gesture nav tutorial." into udc-dev
2023-05-12 21:41:38 +00:00
6cfe9d1827
Merge "Cleanup SettingsChangeLogger onClose()" into udc-dev am: 87abc0644b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159149
Change-Id: I8f2cc9be5a53dc0025e39e0b34eeac23b7e2b9e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 18:21:20 +00:00
87abc0644b
Merge "Cleanup SettingsChangeLogger onClose()" into udc-dev
2023-05-12 17:39:19 +00:00
14035ceaff
Merge "Separate animations and add dragOffSet points in dragOptions" into udc-dev am: 125e121834
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22862532
Change-Id: Id61315d5e0d15da6354927889fa97ea8eb957528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 15:55:10 +00:00
125e121834
Merge "Separate animations and add dragOffSet points in dragOptions" into udc-dev
2023-05-12 15:22:48 +00:00
7f8d1be2f8
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: Iff180fa693f54f295334b6cce63e1e26853e73dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 10:58:16 +00:00
5ed0d0ce99
Merge "Use PROFILE_INACCESSIBLE to track locked profile" into udc-dev
2023-05-12 10:13:41 +00:00
f4835a8884
Force Taskbar to remain stashed when in 3p launcher or recents
...
This patch makes it so that the transient Taskbar cannot unstash when in 3P launcher.
Previously, the user was able to unstash Taskbar when in 3P launcher, causing a janky-looking UI (3P launchers may implement their own version of Taskbar on the home screen. This also caused problems with certain Taskbar commands like split screen, which provide an entry portal to Pixel-specific implementations.
Fixed by forcing the Taskbar to stay stashed when a 3P Launcher is displayed. The Taskbar is still usable inside of other non-launcher apps. This was done by using TopTaskTracker to check for ACTIVITY_TYPE_HOME or ACTIVITY_TYPE_RECENTS, and disabling Taskbar when these activities are running.
Fixes: 277963491
Test: Manual
Change-Id: Ifc0f3c07e3b76eb610f93205978fbc596bab6253
2023-05-12 00:32:24 -07:00
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
303d6101fb
Merge "Fix not tracking splitting tasks correctly" into udc-dev
2023-05-12 00:49:21 +00:00
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
e201480e77
Merge "Add logs to check which userId is used for workProfile matcher" into udc-dev
2023-05-12 00:07:37 +00:00
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
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
f68f1fa3cc
Cleanup SettingsChangeLogger onClose()
...
* Correct name for San*d*box
Bug: 280463854
Flag: none
Test: v2/gnl-eng/unbundled/launcher/nexus_unit_test_multi_device_platform
Change-Id: I2446871c8ea0b146ccfa2ea7caa1727aec42dd42
2023-05-11 16:32:27 -07: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
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
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
7158d2d0e2
Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev
2023-05-11 22:31:34 +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
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
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
04a6211120
Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev
2023-05-11 20:22:51 +00:00
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
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
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
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
662787540c
Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"
...
This reverts commit 7344766886
2023-05-11 18:50:35 +00:00
674ef91120
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-05-11 18:29:23 +00:00
e63401e711
Separate animations and add dragOffSet points in dragOptions
...
For 1, when animateShift() is called shiftAnimation() is the only thing needed.
2, by having point saved in preDragCondition, we can use that to update the drag layers and not have to
modify registrationX/Y later
Removed dragVisualizedOffset since it does not do anything.
There is an issue that also needs to be fixed if user decides to long click
on a search result and let go, the icon flashes at the touch point when you let go.. so we check when mContent can be shown in DragView
depending on if there is dragOffset.
If there is dragOffset, set mContent to invisible.
If there is no dragOffset, set mContent to visible because it doesn't matter as the original content is at the same spot.
bug: 245659929
test: manual: video: https://drive.google.com/file/d/1JQ0pud31HU0WlrqecX0v1cdPKQ37jQCf/view?usp=sharing
Change-Id: I4d2276b9c43e1e92c45d8538b8dde70baa84a5e8
2023-05-11 10:50:17 -07:00
5c5472ff96
Fix UI issues of fake task view in gesture nav tutorial.
...
This change fixes the bug where the view for the fake task in the overview gesture was not being reset correctly. This was leading to UI issues such as lack of rounded corners and incorrect animations in the gesture navigation tutorial.
Flag: ENABLE_NEW_GESTURE_NAV_TUTORIAL
Fix: 281121451
Fix: 281121699
Fix: 281785378
Test: Manually went through the tutorial on handheld, foldable, and
tablet devices
Change-Id: I424a471013d2b8667724f790618d142ba7ae9a7b
2023-05-11 17:41:18 +00:00
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
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
fda9f3d430
Merge "Make taskbar touchable region smaller in Overview" into udc-dev
2023-05-11 14:48:18 +00:00
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
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
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
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
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
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
Jeremy Sim
Fengjiang Li
Saumya Prakash
Treehugger Robot
Brandon Dayauon
Pavel Grafov
Jerry Chang
Winson Chung
Tony Wickham
Vinit Nayak
Sunny Goyal
Bill Yi
Mady Mellor
Thales Lima
TreeHugger Robot