Commit Graph

6590 Commits

Author SHA1 Message Date
TreeHugger Robot 8c49ddde2f Merge "Revert "Revert "Add TaskbarModeSwitchRule to test both transient/persistent taskbar.""" into tm-qpr-dev am: 87ccecb6fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20425196

Change-Id: Iee51b45263db80c85dd480d9061e0ca6b7fc1c46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 23:00:27 +00:00
TreeHugger Robot 87ccecb6fc Merge "Revert "Revert "Add TaskbarModeSwitchRule to test both transient/persistent taskbar.""" into tm-qpr-dev 2022-11-15 22:31:55 +00:00
TreeHugger Robot 48f73b2e53 Merge "Update string for "swipe to go home" when in button nav." into tm-qpr-dev am: ab61359a81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20311607

Change-Id: Iadaabcbfcc59b57916beb3e1077680ae87733177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 16:39:57 +00:00
TreeHugger Robot ab61359a81 Merge "Update string for "swipe to go home" when in button nav." into tm-qpr-dev 2022-11-15 16:30:32 +00:00
Pat Manning 39a3ac6fe5 Update string for "swipe to go home" when in button nav.
Bug: 252938555
Test: manual
Change-Id: Id52867ec6a9b82a44ab0a803a9824258d9ad4044
2022-11-15 11:19:32 +00:00
Schneider Victor-tulias 7d9e1d6fb9 Merge "Return to home when overview command fails." into tm-qpr-dev am: 62b9f80d1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20442700

Change-Id: I0a5517e8d26e276e021f49dd39deacffaec79b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 21:08:08 +00:00
Schneider Victor-tulias 62b9f80d1e Merge "Return to home when overview command fails." into tm-qpr-dev 2022-11-14 20:44:52 +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 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 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
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
Schneider Victor-tulias 0844f2e8ef Return to home when overview command fails.
Returning a runnable list that doesn't get run later causes the overview command to be added to the pending command queue, but never gets removed. This causes following overview (and home on tablets) commands not to respond.

Test: forcefully caused the error condition programmatically; checked the queue is cleared and the user is sent home.
Fixes: 255851262
Change-Id: I9d2f54960c54963b1e7480a597d05911201c152b
2022-11-10 11:56:09 -08: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
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
Jon Miranda f0349354ec Revert "Revert "Add TaskbarModeSwitchRule to test both transient/persistent taskbar.""
This reverts commit e7011d2b87.

Reason for revert: attempt to fix test issues

- Instead of using SharedPrefs which can be flaky anyways,
  we pass along a boolean to test transient taskbar when
  we are in the test harness

Bug: 257549303
Test: TaplTestsTaskbar
Change-Id: I7c15a97363adc377f29853c1fe60b1960c77bfc3
2022-11-10 11:11:14 -08: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
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 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 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 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 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
Jerry Chang e444ffb124 Make multi-instances split opt-in based
Remove appending MULTIPLE_TASK flag when starting an intent and a task
into split screen and leave it to wm-shell to decide whether to append
the flag or not.

Bug: 255224696
Test: atest WMShellFlickerTests
Test: manual check the start intent and task flow
Change-Id: I3d887f8dcea67b12a7e94cef55850d52a79a8d2d
2022-11-08 08:59:35 +00:00
Jon Miranda 97198b03f7 Merge "Stash taskbar if user touch down above the gesture height." into tm-qpr-dev am: 92564539d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20391178

Change-Id: I7e55d23264446cdb747682acbf01468a1487535f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 01:24:00 +00:00
Jon Miranda 92564539d2 Merge "Stash taskbar if user touch down above the gesture height." into tm-qpr-dev 2022-11-08 01:00:46 +00:00
Jon Miranda d5a6b5f688 Add TaskbarModeSwitchRule to test both transient/persistent taskbar.
- Lays the foundation for transient taskbar tests.
- Does not add flags that would add ACTION_OUTSIDE in tests.
  We can address testing this functionality in a separate CL

Bug: 257549303
Test: TaplTestsTaskbar
Change-Id: I44acc5e589b959e6d4bc93fdc369e503c54e7d87
2022-11-07 14:18:37 -08:00
Schneider Victor-tulias aa631328c5 Merge "Refactor recents attached to window animation to keep state handling synchronized." into tm-qpr-dev am: cd587212a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20388919

Change-Id: I1a6f8f2191d2b9a01f89279c6a04f101c72a1611
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 18:48:15 +00:00
Alex Chau 6d18d1a974 Merge "Change taskbar corner roundness when entering overview" into tm-qpr-dev am: 3cf779270b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20311858

Change-Id: I938abff8fcd1c435724d26d884a3546e87ba08c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 18:46:49 +00:00
Jon Miranda b0523697c6 Stash taskbar if user touch down above the gesture height.
Bug: 252905206
Test: open taskbar, tap in gesture area, confirm no stash
      open taskbar, tap on taskbar item, confirm no stash
      open taskbar, tap to the side above gesture area, confirm stash

Change-Id: Ide030840440b5f0541d0ccfb055b8a8a7e851657
2022-11-07 10:37:28 -08:00
Schneider Victor-tulias cd587212a2 Merge "Refactor recents attached to window animation to keep state handling synchronized." into tm-qpr-dev 2022-11-07 18:21:53 +00:00
Alex Chau 3cf779270b Merge "Change taskbar corner roundness when entering overview" into tm-qpr-dev 2022-11-07 18:08:22 +00:00
Nicolo' Mazzucato 2370406efb Add CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS
Bug: 231130484
Bug: 228969045
Test: recorded prefetto trace while going to recents
Change-Id: If33daaa22f904c928f5d4a561a7ac1a03d82b7eb
2022-11-07 16:52:32 +00:00
Alex Chau 68e7fe6b7d Change taskbar corner roundness when entering overview
- Roundness will be 0 in Launcher, and 1 in an app

Bug: 250645563
Test: With and without taskbar in overview, switch between home/overview/app and observe the round corners above taskbar
Test: Ensure corner above taskbar is correct in overview and in app when chat bubble is active
Change-Id: I1f4911626c8e79fce8d81a76a9bd0d0670d111da
2022-11-07 12:58:47 +00:00
Schneider Victor-tulias 5bb69206a3 Refactor recents attached to window animation to keep state handling synchronized.
Bug: 244593270
Bug: 243471493
Test: went from from app, launched overview from app/home, started overview, then swiped to home from app/home
Change-Id: If3ce8d5d145941af3fac936be28c0fc59c18932b
2022-11-04 15:14:54 -07:00
Schneider Victor-tulias 924e673804 Merge "Improve RecentsModel log dump for ease-of-use and readability." into tm-qpr-dev am: 345ef9ffba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20290151

Change-Id: I67b5b9c1f60a4c1b2af44d16b6c20d34b4314fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 18:26:58 +00:00