Commit Graph

12688 Commits

Author SHA1 Message Date
Vinit Nayak 0abb205fef Merge "Prevent dropping a drag from TaskbarAllApps in Overview" into tm-qpr-dev am: 50306445a1 am: f47e27ee4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20324839

Change-Id: I6c456545cba82946f5a92d4e7a1bcaa8b14c4d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 19:39:53 +00:00
Vinit Nayak f47e27ee4f Merge "Prevent dropping a drag from TaskbarAllApps in Overview" into tm-qpr-dev am: 50306445a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20324839

Change-Id: Ie80c46c5c86fde41f259ff2e07ca4213b45a673d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 19:21:19 +00:00
Vinit Nayak 50306445a1 Merge "Prevent dropping a drag from TaskbarAllApps in Overview" into tm-qpr-dev 2022-11-14 19:07:59 +00:00
Jerry Chang 309d627e7d Merge "Make multi-instances split opt-in based" into tm-qpr-dev am: 168c204f49 am: b4f100354e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20306070

Change-Id: I404a73891dc8646b223b47e544ff0de69b5dac45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:23:47 +00:00
Jerry Chang b4f100354e Merge "Make multi-instances split opt-in based" into tm-qpr-dev am: 168c204f49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20306070

Change-Id: Icec4268adf433679226a7cb26dbdfd0327e899a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:51:16 +00:00
Jerry Chang 168c204f49 Merge "Make multi-instances split opt-in based" into tm-qpr-dev 2022-11-14 13:29:46 +00:00
Vinit Nayak f6abb5d4a1 Only show split button for single fullscreen task if taskbar is present in Overview am: 584332202c am: b8ef284a6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20442504

Change-Id: Iadefe00411ce025817f92d8e3a644412cb82a15d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-12 03:57:40 +00:00
Vinit Nayak b8ef284a6c Only show split button for single fullscreen task if taskbar is present in Overview am: 584332202c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20442504

Change-Id: Ifde61fadc084a707e60a0d66db2f4fd06b7ef669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-12 03:11:16 +00:00
Evan Rosky eb31fcc888 Merge "Revert^4 "Enable Shell Transitions"" 2022-11-11 23:31:25 +00:00
Tracy Zhou 0b96f63514 Merge "Use movement on the trackpad instead of on screen for trackpad gestures used for gesture nav" 2022-11-11 22:31:35 +00:00
Tracy Zhou aef9d75f78 Use movement on the trackpad instead of on screen for trackpad gestures used for gesture nav
Bug: 254783214
Test: https://recall.googleplex.com/projects/3388b17c-d22f-46f8-b140-a102690377b4/sessions/f3311fbc-d8cf-4f19-b83c-8626aa285452
Change-Id: Iad2da5831af85dd3647e1e31b42fea0a6302b49c
2022-11-11 00:05:03 -08:00
Vinit Nayak eae4c99434 Prevent dropping a drag from TaskbarAllApps in Overview
* Don't close TaskbarAllApps once drag starts
(see comment in code regarding needing multiple shared drag
layers)
* Hide app menu split options for taskbar in overview
* One TODO is that the animation needs to be tweaked
because the scale of the icon when it's returned is too large.
* I think maybe we have to change the
TaskbarDragController#mDragIconSize since that gets directly
set from a resource. Unclear.

Test: Dragged in TaskbarAllApps in overivew and in split
select, app returned to original position and not taskbar
Bug: 251747761

Change-Id: I785f34b0bdb0b0abfc440450494074f8dfe7c31a
2022-11-10 16:17:26 -08:00
Vinit Nayak 584332202c Only show split button for single fullscreen task if taskbar is present in Overview
* Taskbar in overview allows second app to be
selected so user wouldn't be stuck in split
select state

Fixes: 258543259
Test: Tested w/ flag on and off
w/ one and multiple flags
w/ fullscreen and split single focused task

Change-Id: Ie588ad66fde4e012e08d8f5abbe1eef5a1a5db6b
2022-11-10 14:20:03 -08:00
Pat Manning 0e77a9a840 Merge "Align system navigation setting link in AllSet page for tablets to top/start." into tm-qpr-dev am: 3c7a7a92b3 am: e6d4939db8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20411892

Change-Id: Idb70a42e28a5b02a351f6ecddd123c3d390e416f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 20:44:06 +00:00
Saumya Prakash a0df11e73c Merge "Add padding around clear all button in overview." into tm-qpr-dev am: 6db7d31ced am: 8d2f42ddd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20413157

Change-Id: I89495c90b7723b36f6828f56d34e557c7458adc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 20:42:32 +00:00
Vinit Nayak 27d004d369 Merge "Improve Split portrait gesture animation" into tm-qpr-dev am: 2ca82f38e4 am: 4b6c05c2ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20330754

Change-Id: Ib1e9cf31c70edb187f6bc8467f7a2d5ddaa9bb1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 20:18:10 +00:00
Jeremy Sim cf8e94592e Merge "Allow user to select second split app from Taskbar" into tm-qpr-dev am: d5525c3bda am: 3d0b47a5ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20365694

Change-Id: I03cc7692d94a8d0aa99e2822442da6251639f190
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 20:17:47 +00:00
Pat Manning e6d4939db8 Merge "Align system navigation setting link in AllSet page for tablets to top/start." into tm-qpr-dev am: 3c7a7a92b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20411892

Change-Id: Ib44b14ba9fb1781efc443d6d10668aac4fdabeae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 20:11:14 +00:00
Pat Manning 3c7a7a92b3 Merge "Align system navigation setting link in AllSet page for tablets to top/start." into tm-qpr-dev 2022-11-10 19:58:48 +00:00
Saumya Prakash 8d2f42ddd2 Merge "Add padding around clear all button in overview." into tm-qpr-dev am: 6db7d31ced
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20413157

Change-Id: I0f9883e153ddb2ab09f17ac3ed453f73ad626496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 19:29:43 +00:00
Vinit Nayak 4b6c05c2ef Merge "Improve Split portrait gesture animation" into tm-qpr-dev am: 2ca82f38e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20330754

Change-Id: I6cd4962097e2c72762cf28f8c4feb01efa66f22b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 19:28:59 +00:00
Saumya Prakash 6db7d31ced Merge "Add padding around clear all button in overview." into tm-qpr-dev 2022-11-10 19:27:53 +00:00
Jeremy Sim 3d0b47a5ea Merge "Allow user to select second split app from Taskbar" into tm-qpr-dev am: d5525c3bda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20365694

Change-Id: I8d1e153a3d9f2b04293a41a0e008cc348fe028d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 19:25:02 +00:00
Vinit Nayak 2ca82f38e4 Merge "Improve Split portrait gesture animation" into tm-qpr-dev 2022-11-10 19:19:39 +00:00
Jeremy Sim d5525c3bda Merge "Allow user to select second split app from Taskbar" into tm-qpr-dev 2022-11-10 18:56:22 +00:00
Saumya Prakash d82fc92b2d Add padding around clear all button in overview.
With different languages, the length of the string "clear all" varies,
leading to the clear all button in overview looking different. This
change adds padding to account for these different lengths to
ensure that users have a consistent experience.

Screenshot for English: https://screenshot.googleplex.com/4oijo96WSfGNwWp.png
Screenshot for Ukrainian: https://screenshot.googleplex.com/Bv2963Vn96BkMeT.png

Test: Manual
Fix: 225119413
Change-Id: I09fe7bc95ca0c2fd7fe620997d1298f2670b50a4
2022-11-09 23:02:12 +00:00
TreeHugger Robot bf6304508f Merge "Add CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS" into tm-qpr-dev am: eaa5703f75 am: 10b0703a40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20339809

Change-Id: I8686db03f5e6e10da7eab976d8624b29ff8bb1c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 13:40:17 +00:00
Pat Manning 2335490fe6 Align system navigation setting link in AllSet page for tablets to top/start.
Fix: 233610579
Test: manual
Change-Id: If6d462df02bf795e8a6e73fbb040a6a84ea99404
2022-11-09 13:19:33 +00:00
TreeHugger Robot 10b0703a40 Merge "Add CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS" into tm-qpr-dev am: eaa5703f75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20339809

Change-Id: Ib8d77e7a1ec40f44b8bccc1dd485c6e10411b616
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 13:08:47 +00:00
TreeHugger Robot eaa5703f75 Merge "Add CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS" into tm-qpr-dev 2022-11-09 12:27:25 +00:00
TreeHugger Robot 195e9ef499 Merge "Revert "Add TaskbarModeSwitchRule to test both transient/persistent taskbar."" into tm-qpr-dev am: 8dd01f3ac2 am: b5c134d72c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20416308

Change-Id: Ie5d094942e3e476a8be47de609a47cf52049e621
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 02:19:58 +00:00
TreeHugger Robot b5c134d72c Merge "Revert "Add TaskbarModeSwitchRule to test both transient/persistent taskbar."" into tm-qpr-dev am: 8dd01f3ac2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20416308

Change-Id: I1c271f89300a0483af71aac53dafebfe7c45429e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 01:32:38 +00:00
TreeHugger Robot 8dd01f3ac2 Merge "Revert "Add TaskbarModeSwitchRule to test both transient/persistent taskbar."" into tm-qpr-dev 2022-11-09 01:07:11 +00:00
TreeHugger Robot 75d4d63363 Merge "Prevent rotating TaskMenuViewWithArrow for large screen" into tm-qpr-dev am: 9297483eef am: 17fdc95996
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20250157

Change-Id: I1b3df76b948e935b138b6990ebf6f37f6c7e1c9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 00:18:30 +00:00
TreeHugger Robot 17fdc95996 Merge "Prevent rotating TaskMenuViewWithArrow for large screen" into tm-qpr-dev am: 9297483eef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20250157

Change-Id: I289a222b4724adb5c98dd241122b9ae3d9e64815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 23:43:53 +00:00
TreeHugger Robot 9297483eef Merge "Prevent rotating TaskMenuViewWithArrow for large screen" into tm-qpr-dev 2022-11-08 23:08:28 +00:00
Jeremy Sim 93fc0f3a7c Allow user to select second split app from Taskbar
This patch makes it so that (when we enable Taskbar in Overview) users will be able to select their second app for splitscreen by tapping the Taskbar icon, or the icon in AllApps.

This was done by performing a check to SplitSelectStateController when a taskbar icon is hit. If we are currently in split select mode, Taskbar/AllApps icons will no longer launch their respective fullscreen apps, but instead confirm the split attempt. The confirmed app will either be an already-running instance of the app, or a fresh instance of the app (if none is currently running). The split confirmation function is located in TaskbarUIController, where it is accessible to both LauncherTaskbarUIController (for 1P Launcher) and FallbackTaskbarUIController (for 3P launchers).

Also cleans up ~2 lines of unused code from the old splitscreen instructions toast.

Outstanding issues:
- When selecting a second app from within AllApps, the AllApps shade does not animate away in a satisfying way
- When selecting a second app and launching a fresh instance of that app, the animation appears to come from the wrong location
- Intent + Intent splitting does not currently work
- If the selected app is already running with multiple instances, it picks the oldest instance. Ideally, the newest instance is preferred.

Bug: 251747761
Test: Manual testing with Taskbar in Overview flag enabled
Change-Id: I302dc092740bb880f9134ba8e2e587c4f2c29d01
2022-11-08 14:38:05 -08:00
Jon Miranda e7011d2b87 Revert "Add TaskbarModeSwitchRule to test both transient/persistent taskbar."
This reverts commit d5a6b5f688.

Reason for revert: Breaks tests due to "SharedPreferences in credential encrypted storage are not available until after user is unlocked"

Bug: 258256906
Change-Id: I1de69249685f9d2e71183357cf3eda8d443c7d97
2022-11-08 21:56:52 +00:00
Vinit Nayak 29e71bdd72 Improve Split portrait gesture animation
* Crop out taskbar from bottom thumbnail for vertical split
* TODO: Need to re-calculate thumbnail sizes if taskbar
 is stashed. There's also a very slight rounding error
 somewhere even in the unstashed case that needs to be
 revisited

Bug: 219411750
Test: Start gesture animation in split in potrait
Change-Id: I35f2415e13af7467e0735ac8865cee0e3e3d27f8
2022-11-08 11:33:08 -08:00
TreeHugger Robot 4c88969413 Merge "Unstash taskbar when transitioning to fallback overview." into tm-qpr-dev am: 98f400397b am: 269c56df92
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20187724

Change-Id: I79602295bb72072c804bffd6e3d6f753babc43c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 18:59:18 +00:00
Jon Miranda c00b037650 Merge "Have responsive taskbar UI during swipe up gesture." into tm-qpr-dev am: caa398ed35 am: b71037c58b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20333665

Change-Id: Ia711d47f8c4d6cd3cd2c9a5201bde2f92ace9f6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 18:58:44 +00:00
TreeHugger Robot 269c56df92 Merge "Unstash taskbar when transitioning to fallback overview." into tm-qpr-dev am: 98f400397b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20187724

Change-Id: I83f29014f6bd50a3bcb3fc2ebf964163438bbcbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 18:26:53 +00:00
Jon Miranda b71037c58b Merge "Have responsive taskbar UI during swipe up gesture." into tm-qpr-dev am: caa398ed35
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20333665

Change-Id: Id96043e6aa186eb04bc5d171fdb72159ae7e4c42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 18:26:43 +00:00
TreeHugger Robot 98f400397b Merge "Unstash taskbar when transitioning to fallback overview." into tm-qpr-dev 2022-11-08 18:14:55 +00:00
Jon Miranda caa398ed35 Merge "Have responsive taskbar UI during swipe up gesture." into tm-qpr-dev 2022-11-08 17:53:05 +00:00
Jon Miranda 12cdc89c7e Merge "Add TaskbarModeSwitchRule to test both transient/persistent taskbar." into tm-qpr-dev am: 881588bfb5 am: 416680d8f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20391679

Change-Id: Ibcc62df1f17de580c3c6f2b18749d5ef6e3be933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 17:10:33 +00:00
Jon Miranda 416680d8f0 Merge "Add TaskbarModeSwitchRule to test both transient/persistent taskbar." into tm-qpr-dev am: 881588bfb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20391679

Change-Id: I46efa448ae986d2fd723e2f98faa09a562cfe98f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 16:38:36 +00:00
Jon Miranda 881588bfb5 Merge "Add TaskbarModeSwitchRule to test both transient/persistent taskbar." into tm-qpr-dev 2022-11-08 16:13:07 +00:00
Pat Manning e1100b904d Unstash taskbar when transitioning to fallback overview.
Update LauncherInstrumentation taskbar visibility check to include assertions in fallback launcher using OverviewObject instead of LauncherObject.

Fix: 253042501
Test: manual
Change-Id: I9f2aa228e8aa97ef8ca1a4535b7f8fcded8a4572
2022-11-08 15:07:12 +00:00
Jon Miranda 29f7474056 Have responsive taskbar UI during swipe up gesture.
- Makes taskbar threshold an absolute Y threshold
  instead of a distance threshold.
- Moves handle, taskbar view, and taskbar background
  during the swipe up gesture

Next CL will address transforming the nav handle <-> taskbar
and ensuring that there's a clean handoff

Bug: 246631059
Test: swipe up on taskbar, release. see bounce
      swipe up on taskbar to go home, proper icon alignment
      swipe up on taskbar, pause for overview, see bounce
      -> further movement should not move taskbar
      test launcher3

Change-Id: I141236fd72428cda7edd0ff116de1d478d18c722
2022-11-08 14:50:02 +00:00