5bf5bf3e22
Merge "Fix bug where unstash animation plays twice." into udc-dev am: ba4fcb0171 am: 08fb20f3be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23153653
Change-Id: Iec340c2da9e692c2b668db800b4fa909b9df86ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 03:13:41 +00:00
08fb20f3be
Merge "Fix bug where unstash animation plays twice." into udc-dev am: ba4fcb0171
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23153653
Change-Id: Ic66df7e63c0e0f9a3428224ced60225f8a708d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 02:31:52 +00:00
ba4fcb0171
Merge "Fix bug where unstash animation plays twice." into udc-dev
2023-05-13 01:47:20 +00:00
3760caebc5
Merge "Allows splitscreen with work & personal version of the same app" into udc-dev am: ab9e66c260 am: 63e922b1e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23200223
Change-Id: Ie781b2184abb2e89608bc1334a2e6839f203aed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 01:30:15 +00:00
63e922b1e5
Merge "Allows splitscreen with work & personal version of the same app" into udc-dev am: ab9e66c260
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23200223
Change-Id: Ib9ba5e508664ae24b68793cd0ef577869a21a7dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 00:48:53 +00:00
ab9e66c260
Merge "Allows splitscreen with work & personal version of the same app" into udc-dev
2023-05-13 00:23:23 +00:00
e30a551f93
Fix bug where unstash animation plays twice.
...
Fixes: 282056846
Change-Id: I372444684fafd246369f6bc1e77c5e6fbb651c6f
Flag: ENABLE_TRANSIENT_TASKBAR
Test: open app, then very quickly swipe to unstash taskbar
2023-05-12 16:27:57 -07:00
fb0b1b205d
Merge "Fix the overview tutorial step success animation" into udc-dev am: 8f23be7b6f am: 938d907d5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122638
Change-Id: I3f9cde302cbe5ef734bbd4e687263461165b0e3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 23:15:39 +00:00
938d907d5b
Merge "Fix the overview tutorial step success animation" into udc-dev am: 8f23be7b6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122638
Change-Id: I6785f09ddea1e889f2b42c26ea93fa6b19e498da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:58:54 +00:00
61af2eff87
Merge "Force Taskbar to remain stashed when in 3p launcher or recents" into udc-dev am: d27b06f500 am: 15cb48db3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22961525
Change-Id: Iedbed1140790adb0f8494496021b8eb012fe42a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:54:50 +00:00
4f41fd3e8a
Merge "Fix UI issues of fake task view in gesture nav tutorial." into udc-dev am: 24aec5e6b0 am: 4e61c4a99c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23120959
Change-Id: Id4affa908a5051ace8b864fe5d8d516f1c8a444e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:54:26 +00:00
8f23be7b6f
Merge "Fix the overview tutorial step success animation" into udc-dev
2023-05-12 22:40:14 +00:00
15cb48db3d
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: I8e565d66ac89438b2d84bb660cb2e58d816dacb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:20:57 +00:00
4e61c4a99c
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: Ibf6bdc7efe84f0a3fa3318f34b0460b4487d307c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:16:48 +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
24aec5e6b0
Merge "Fix UI issues of fake task view in gesture nav tutorial." into udc-dev
2023-05-12 21:41:38 +00:00
3bea236db6
Merge "Cleanup SettingsChangeLogger onClose()" into udc-dev am: 87abc0644b am: ad9704d92d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159149
Change-Id: I99289350e11b788e0c81910ea66a060a116824be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 18:59:53 +00:00
ad9704d92d
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: Ic86fc6d9e8f2787e8761f1a412c0ca8ec4901f98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 18:21:05 +00:00
87abc0644b
Merge "Cleanup SettingsChangeLogger onClose()" into udc-dev
2023-05-12 17:39:19 +00:00
a8ccd542bc
Fix the overview tutorial step success animation
...
- Tapping the screen after a successful overview gesture, but before the delayed success feedbck created a janky experience
- Immediately setting the gesture as successful
Flag: ENABLE_NEW_GESTURE_NAV_TUTORIAL
Fixes: 281742006
Test: tapped the screen quickly after successfully completing the overview gesture
Change-Id: I166060191753d6b95bc223e2be08df2bb4b4ecfd
2023-05-12 10:24:39 -07:00
cfca5cb416
Merge "Separate animations and add dragOffSet points in dragOptions" into udc-dev am: 125e121834 am: fb51d87af8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22862532
Change-Id: Id58abd3541cc871ba54d91121a27b888acaad591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 16:30:33 +00:00
fb51d87af8
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: I93f9d76aeee50573082581ad0ea0f072f46e184b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 15:54:51 +00:00
125e121834
Merge "Separate animations and add dragOffSet points in dragOptions" into udc-dev
2023-05-12 15:22:48 +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
92e1eeb5f0
Allows splitscreen with work & personal version of the same app
...
This patch makes changes in various splitscreen controllers to pass userId to the new shell API, to allow same-app splitting with different users.
Fixes: 274973415
Test: Manual
Change-Id: I810b5353aad738c7c275856586b9c521f1554022
2023-05-11 22:10:51 -07: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
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
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
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
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
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
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
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
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
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
072d338505
Merge "Make taskbar touchable region smaller in Overview" into udc-dev am: fda9f3d430 am: 79bc256775
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22995656
Change-Id: Ia7ac787b25543fca86abb8a3dda1cf34f5f5762c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 16:06:48 +00:00
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
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
3ecd8a8ac9
Defer intercepting touch events to actually start shifting tasks am: 2792271688 am: 45aa875f1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23163166
Change-Id: I6c2e5cca96d4724b04f210994d9e814cf812c732
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 09:47:06 +00:00
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
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
Treehugger Robot
Jeremy Sim
Jon Miranda
Schneider Victor-tulias
Saumya Prakash
Brandon Dayauon
Jerry Chang
Winson Chung
Tony Wickham
Vinit Nayak
Mady Mellor
Thales Lima