Commit Graph

16962 Commits

Author SHA1 Message Date
Jeremy Sim 29428d406e Merge "Add a fail string for app pair menu tests" into main 2023-08-30 23:29:40 +00:00
Saumya Prakash a698652981 Merge "Remove extraneous transition from Overview to Home screen" into udc-qpr-dev am: dbd47e9f75 am: e5b09cd7f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24587641

Change-Id: I6c3c15584cf07e88748e020356bcf1fed30c9314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 23:27:26 +00:00
Saumya Prakash e5b09cd7f1 Merge "Remove extraneous transition from Overview to Home screen" into udc-qpr-dev am: dbd47e9f75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24587641

Change-Id: I350f08b5d09a9f7c17a93529b0a9bfd033e2a04c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 23:27:09 +00:00
Saumya Prakash dbd47e9f75 Merge "Remove extraneous transition from Overview to Home screen" into udc-qpr-dev 2023-08-30 23:06:15 +00:00
Saumya Prakash c4cc4b13b1 Remove extraneous transition from Overview to Home screen
Previously, users used to be able to swipe down near the
bottom of the screen to leave overview. This was causing the taskbar to
animate to home while still in overview (and causing jank). Since this isn't expected behavior for
how to leave overview, this change removes that method.

Flag: N/A
Fix: 284416178
Test: Completed multiple transitions (ex. Overview to home) with 3
button nav and gesture nav. Ensured swiping down from below the recents
task does not go to the home screen while not affecting other
transitions.

Change-Id: I8cdfde71117dd947174d9c3c3a7f834fbeaddcca
2023-08-30 21:24:45 +00:00
Andreas Agvard c41b4e4744 Merge "Fixes search feature invocation issue" into udc-qpr-dev am: 7d793ecdda am: 0c93438614
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24586848

Change-Id: Id0b016b3ac7ea7d5d99df9f526496b6843d50a56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 21:00:08 +00:00
Andreas Agvard 0c93438614 Merge "Fixes search feature invocation issue" into udc-qpr-dev am: 7d793ecdda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24586848

Change-Id: I9cbd977cd6091f5259fc137541ab9e11f00e5def
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 20:10:22 +00:00
Andreas Agvard 0b8c5fa5c7 Fixes search feature invocation issue
Fixes: 297866704
Flag: N/A
Test: Manual
Change-Id: I9647504e6c6999ce7aa17ab4acfc65d522dcd2af
2023-08-30 20:16:11 +02:00
Sukesh Ram 3f2338a8e8 Remove Windowing Prototype 1 from Codebase
Refactor codebase to remove Proto1 as it is no longer supported.

Test: aTest WMShellUnitTests
Bug: 297217817
Change-Id: Ifaf67754c048d913fe203f4b34efc3c9c611039c
2023-08-30 17:40:13 +00:00
Jeremy Sim 8850e58844 Add a fail string for app pair menu tests
This patch adds a clarifying message for testSaveAppPairMenuItemExistsOnSplitPair() and testSaveAppPairMenuItemDoesNotExistOnSingleTask(). The test should not run when the feature is not yet enabled.

Fixes: 297083938
Test: N/A
Change-Id: Idf4c99ed393e2d6e2c2b7b77dc6083a27c4f90d1
2023-08-29 14:07:47 -07:00
Vinit Nayak ccce958c18 Merge "Move ending CUJ_SPLIT_SCREEN_ENTER to after we show tasks to user" into udc-qpr-dev am: 1757f1b2c0 am: 53ce6a6656
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24575470

Change-Id: Idc39633e4cb0e5eb63f298afb0ba2116b7dad52e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 21:03:32 +00:00
Treehugger Robot 869ef4adea Merge "Cleanup logs for LAUNCH_SPLIT_PAIR" into main 2023-08-29 19:55:29 +00:00
Treehugger Robot 5d5c7d9644 Merge "Add logs around hotseat suggested apps" into udc-qpr-dev am: 41d269a43b am: cde39e3cfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24529027

Change-Id: I04f52c10ad56418d64d39cc1ec2cd083f4c4ce6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 17:48:04 +00:00
Matt Sziklay 1db1b432d2 Merge "Merge "Specify stage and bounds for desktop split." into udc-qpr-dev am: 8020100928 am: a5e28a3af2" into main 2023-08-29 16:52:03 +00:00
Vinit Nayak 53ce6a6656 Merge "Move ending CUJ_SPLIT_SCREEN_ENTER to after we show tasks to user" into udc-qpr-dev am: 1757f1b2c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24575470

Change-Id: I10e3b27190f0770d0bb641137879971514447718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 05:47:00 +00:00
Vinit Nayak 1757f1b2c0 Merge "Move ending CUJ_SPLIT_SCREEN_ENTER to after we show tasks to user" into udc-qpr-dev 2023-08-29 05:02:42 +00:00
Treehugger Robot cde39e3cfd Merge "Add logs around hotseat suggested apps" into udc-qpr-dev am: 41d269a43b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24529027

Change-Id: If446b69e23e9c7e22e5193c2890eb0fa84de3a38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:36:32 +00:00
Treehugger Robot 41d269a43b Merge "Add logs around hotseat suggested apps" into udc-qpr-dev 2023-08-28 23:09:44 +00:00
Vinit Nayak 7a2cea6b8a Cleanup logs for LAUNCH_SPLIT_PAIR
Fixes: 288939273
Change-Id: I39624ce0ba9951bdea7691545268cdc369d1c606
2023-08-28 22:44:08 +00:00
Merissa Mitchell b0b8e3a533 Merge "Fix NPE from NavbarButtonsViewController on FEATURE_PC devices." into main 2023-08-28 21:53:16 +00:00
Matt Sziklay e9dd0d6d49 Merge "Specify stage and bounds for desktop split." into udc-qpr-dev am: 8020100928 am: a5e28a3af2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24376138

Change-Id: I6283b096a6e3f03204c37bb67446318d8a5dff9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 20:18:24 +00:00
Andy Wickham 04f5b767c2 Rename AssistUtilsBase -> AssistUtils am: b2ac210120 am: a8c9d7161f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24555400

Change-Id: I5d17902c7fe76dcdd07728fc4c7935e68aec82f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 20:17:58 +00:00
Treehugger Robot a3f7992c84 Merge "Cap the width of the bubble bar when collapsed" into udc-qpr-dev am: dddd60e84f am: dc1b080293
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24446027

Change-Id: I21ee0ac1a10c9769e9091d2743fdcc88fe64f0a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 19:32:21 +00:00
Vinit Nayak db248cf94f Move ending CUJ_SPLIT_SCREEN_ENTER to after we show tasks to user
* Previously the CUJ was ending after only the launcher side
animation was completing, before we actually made the
call into shell to launch the tasks

Test: Compiles (no baseline to test metrics/latency off of)
Bug: 285578568
Change-Id: I958e4a5265cb2fd81f2358343846385058b4465a
2023-08-28 19:03:39 +00:00
Treehugger Robot 5cf32b27d0 Merge "Revert "Hold WeakReference to split callback"" into main 2023-08-25 22:23:38 +00:00
Matt Sziklay a5e28a3af2 Merge "Specify stage and bounds for desktop split." into udc-qpr-dev am: 8020100928
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24376138

Change-Id: I38e200140074f2f2ee3dd4ffa5068babb1886e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 21:50:24 +00:00
Andy Wickham a8c9d7161f Rename AssistUtilsBase -> AssistUtils am: b2ac210120
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24555400

Change-Id: Idde965260aef41cd3fe662557051ccc92418e8c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 21:49:54 +00:00
Vinit Nayak 06be7eb88e Revert "Hold WeakReference to split callback"
This reverts commit 3f5e3ad419.

Reason for revert: b/297562709

Change-Id: I889d126e622e9cf13513365145eac28eaefa8627
2023-08-25 20:52:45 +00:00
Matt Sziklay 8020100928 Merge "Specify stage and bounds for desktop split." into udc-qpr-dev 2023-08-25 20:50:59 +00:00
Andy Wickham b2ac210120 Rename AssistUtilsBase -> AssistUtils
Bug: n/a
Test: n/a
Flag: n/a
Change-Id: Ia227b180732d0acfdc4b648885d5ce208d86ee49
2023-08-25 12:12:17 -07:00
Bill Yi 69f23b6a93 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-08-25 18:06:32 +00:00
Treehugger Robot 061c9b2542 Merge "Hold WeakReference to split callback" into main 2023-08-25 17:53:56 +00:00
Treehugger Robot dc1b080293 Merge "Cap the width of the bubble bar when collapsed" into udc-qpr-dev am: dddd60e84f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24446027

Change-Id: If09506013aaf6cfe5249c7948216c6f675cb859d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 15:34:29 +00:00
Treehugger Robot dddd60e84f Merge "Cap the width of the bubble bar when collapsed" into udc-qpr-dev 2023-08-25 15:07:56 +00:00
Treehugger Robot f6803014ae Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-08-25 07:27:08 +00:00
Tracy Zhou 1d71563b56 Merge "Ignore touch slop threshold for trackpad gestures using gesture nav" into udc-qpr-dev am: 17f50eb8a8 am: 5f37111e05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24542608

Change-Id: I0cd151ce2d05cb654c8b54f74f051928ad991293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 06:06:47 +00:00
Tracy Zhou 5f37111e05 Merge "Ignore touch slop threshold for trackpad gestures using gesture nav" into udc-qpr-dev am: 17f50eb8a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24542608

Change-Id: Ie8ad90ddb686f684cdb424e0f7c74f05bca1a31c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 05:23:35 +00:00
Tracy Zhou 17f50eb8a8 Merge "Ignore touch slop threshold for trackpad gestures using gesture nav" into udc-qpr-dev 2023-08-25 04:29:58 +00:00
Tracy Zhou a2227658db Ignore touch slop threshold for trackpad gestures using gesture nav
Gesture library has a threshold for 3-finger swipes, and if it's recoginized as one, it only reports movement in one axis. There is no point waiting for it to pass the initial threshold, unlike gestures on the screen.

Bug: 291771975
Test: swipe up slowly, observe the smoothness of the gesture nav animation.
Change-Id: I0904efb1d5cd26f6566da46279d0153e19a9618c
2023-08-24 18:29:44 -07:00
Merissa Mitchell a779330a56 Fix NPE from NavbarButtonsViewController on FEATURE_PC devices.
When FEATURE_PC is enabled on a device,
DesktopNavbarButtonsViewController is instantiated. Previously,
DesktopNavbarButtonsViewController saves an internal copy of
mControllers and the mControllers field in NavbarButtonsViewController
is left unset. This was not a problem because mControllers in
NavbarButtonsViewController was not used in any code that was not
overridden by DesktopNavbarButtonsViewController.

ag/17944073 added some code that accesses mControllers in
NavbarButtonsViewController. Even though the code would be skipped for
FEATURE_PC devices (due to the TaskbarUIController check, which is
overridden by DesktopTaskbarUIController) in the end, it still caused an
NPE.

DesktopNavbarButtonsViewController does not require most of the button
updates done in NavbarButtonsViewController. Regardless, this CL
provides a workaround to avoid the NPE by setting mControllers in
NavbarButtonsViewController in FEATURE_PC devices.

Bug: 296623609
Bug: 297260211
Test: Manual; build and launch sdk_gpc emulator. Ensure that no crash
occurs

Change-Id: Ica22359b96fd0a277c575a238abb194d762e81ea
2023-08-24 17:22:48 -07:00
Treehugger Robot fd77e2350a Merge "Adding support for clearing overview suggestion state when overview is disabled" into udc-qpr-dev am: 830524d883 am: 646722fdaf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24516473

Change-Id: If42b71351fa049457d4660f56dde56a9a375c6d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 23:27:38 +00:00
Treehugger Robot 646722fdaf Merge "Adding support for clearing overview suggestion state when overview is disabled" into udc-qpr-dev am: 830524d883
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24516473

Change-Id: I74804233367ebab71086b6f6f0d27c881f8927e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 22:44:29 +00:00
Vinit Nayak ddc9d5eb73 Merge "Add back gesture support when split selection active" into main 2023-08-24 22:27:39 +00:00
Treehugger Robot 830524d883 Merge "Adding support for clearing overview suggestion state when overview is disabled" into udc-qpr-dev 2023-08-24 22:19:01 +00:00
Mady Mellor dd1b2af955 Merge "Set a view id for the bubble dismiss view (launcher)" into main 2023-08-24 21:48:52 +00:00
Andy Wickham ce2f0de10f Merge "Use new AssistUtils(Base) to override SysUI Assist invocations." into udc-qpr-dev am: 5ed1b4001b am: 77baaf6f25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24454133

Change-Id: If7c2b5051faa713baa3aed6cee8c5d1f44fa5594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 20:10:53 +00:00
Treehugger Robot c51bd823c6 Merge "Properly marking TaplTestsSplitscreen with test annotations" into udc-qpr-dev am: 51ba9a6097 am: 1eca4f907b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24512901

Change-Id: I2bec08342bcb257adc65064d61e95d81657a4f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 20:10:36 +00:00
Andy Wickham 77baaf6f25 Merge "Use new AssistUtils(Base) to override SysUI Assist invocations." into udc-qpr-dev am: 5ed1b4001b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24454133

Change-Id: I90a87cf156213c2dfad374f3410f9ac766b69711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 20:05:48 +00:00
Treehugger Robot 1eca4f907b Merge "Properly marking TaplTestsSplitscreen with test annotations" into udc-qpr-dev am: 51ba9a6097
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24512901

Change-Id: Iba2083afd69e9f433de90ed00f6e2e8db4bd11e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 20:05:05 +00:00
Andy Wickham 5ed1b4001b Merge "Use new AssistUtils(Base) to override SysUI Assist invocations." into udc-qpr-dev 2023-08-24 19:36:12 +00:00