Commit Graph
26 Commits
Author SHA1 Message Date
Jagrut Desai 7cada7c46b Two Taskbar Bug
This cl fixes two taskbar bug being present when invoking CtS.

Solution: simply measure displacement and compare that with slop to animate taksbar background or not.

Test: Presubmit
Bug: 360116669
Flag: EXEMPT Bug Fix

Change-Id: I7d5a95e1a3729e30e5cf588dcf5b823f3d7de93f
2024-09-30 16:32:47 -07:00
Jon Miranda 86a4b653b9 Add FLAG_DELAY_TASKBAR_BG_TAG to restrict when taskbar bg anim gets delayed.
We set it only when user swipes up to unstash.

Fixes: 360778703
Test: swipe up to home, long click on taskbar icon before it settles
Flag: com.android.launcher3.enable_scaling_reveal_home_animation
Change-Id: I24ff466ee6730e3739d85307363567cfa1455cbf
2024-09-13 19:08:46 -07:00
Jordan Silva e7ae4e31ae Refactoring OverviewCommandHelper (1/3)
- Updates pendingCommands to be a ConcurrentLinkedDeque and make the list safe across multiple threads.
- Introduces CommandStatus to clear only IDLE and COMPLETED commands.
- Adds CommandType enum to prevent adding an invalid command value into the queue and having an unexpected behavior.
- Log messages improved

Bug: 352046797
Bug: 351122926
Flag: EXEMPT bugfix.
Test: Manual.
Change-Id: I80705dca0be579e62cb9e2bd923808dd33c4d633
2024-08-28 17:09:29 +01:00
Mady Mellor 788a6ebb74 Make an input consumer for bubble bar
Instead of unstashing bubble bar in TaskbarUnstashInputConsumer
handle it in its own input consumer instead. This is a nicer
separation of concerns and simplifies the logic in both places.

Additionally, this fixes issues where swiping up the bubble bar
handle might initiate / be handled by gesture nav (or all apps) when
really any events originating on bubble UI should be managed by
bubbles instead.

Adds some mostly mock'd tests to check that the static method used
to indicate if bubbles should take the event or not works correctly.

Flag: com.android.wm.shell.enable_bubble_bar
Test: manual - test swipe up on bubble bar handle in an app
             - test swipe up on bubble bar on home - it should
               open & all apps / launcher transition shouldn't happen
             - longpress to drag bubbles around on home and overview,
               try the collapsed bar & individual bubbles in the
               expanded bar
             - test dragging on the bubble bar after it's revealed
               in an app
Test: atest BubbleBarInputConsumerTest
Bug: 345488529
Change-Id: I964d213d71de15e4350cff5202dfb9343de1af14
2024-08-19 15:26:37 -07:00
mpodolian 484ff0fe9c Integrated new BubbleStashControllers into the existing code.
Integrated the PersistentTaskbarStashController and the
TransientTaskbarStashController into the launcher code. Made changes to
the TaskbarInsetsController to set appropriate touchable zones. Updated
the TaskbarUIController to not start the overview transition on clicks
for the collapsed bubble bar.

Bug: 346391377
Fixes: 350065038
Fixes: 355664783
Flag: com.android.wm.shell.enable_bubble_bar_in_persistent_task_bar
Test: com.android.launcher3.taskbar package tests

persistent taskbar and transient taskbar manual testing:
- on launcher home screen expand bubble bar, switch between bubbles,
remove bubble via bubble menu, add bubble, remove bubble with the drug
gesture, add bubble, collapse bubble bar
- repeat previous test on launcher overview screen and inside any
application
- after last test drag expanded bubble view to the opposite side of the
screen

Change-Id: I50f2c510854c4895fdfc9bd453a261c2103286fd
2024-07-30 18:36:05 -07:00
Jon Miranda 4a4b7a8059 Delay taskbar background fade in animation
- Taskbar background will fade in based on
  1. Velocity threshold
  2. End target gesture destination

Bug: 298089923
Bug: 345768019
Test: swipe up fast to go home, note no taskbar bg
      swipe up slow to reveal taskhome, note taskbar bg shows immediately
Flag: com.android.launcher3.enable_scaling_reveal_home_animation DISABLED

Change-Id: I2c16352e1c0c52a8afc49900a39b80383bacde62
2024-06-11 15:39:55 -07:00
Pat Manning f0bff25b1e Merge "Unstash taskbar after timeout when cursor hovers bottom edge." into main 2024-05-13 12:44:21 +00:00
Pat Manning 5f838c45c2 Unstash taskbar after timeout when cursor hovers bottom edge.
This prevents accidental triggering of Taskbar unstash with cursor when the user wants to click the handle to go home.

Fix: 338357087
Test: TaplTestsTransientTaskbar
Flag: com.android.launcher3.enable_cursor_hover_states
Change-Id: I76f3e31cb2588a0fae302278c847227e9548be8f
2024-05-09 16:10:30 +01:00
Holly Sun 1d90321484 [omni] Let parent to allow intercept when it's in the 2nd stage.
Discussed with Andy for ideas - instead of passing the outer touch slop out, it might be easier to let parent to allow intercept when it's in the 2nd stage (e.g., OverviewInputConsumer doesn't have touch slop handling logic). So we can go through this if: https://source.corp.google.com/h/googleplex-android/platform/superproject/main/+/main:packages/apps/Launcher3/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java;l=105;drc=deee0d06f624223b808593997cf22042c9aa5142
`mDelegate` can be `OverviewInputConsumer` or `OtherActivityInputConsumer` or `TaskbarUnstashInputConsumer`.

Bug: 330446193
Flag: legacy ENABLE_LPNH_TWO_STAGES disabled
Test: manual
Change-Id: I1f33172f1614a750a01632c8c945ee5e5cbd7adc
2024-05-01 10:02:40 -07:00
Tony Wickham 18551f29fe Remove ENABLE_TRANSIENT_TASKBAR and long-press stash support
Flag: NA
Test: manual, TaplTestsTaskbar, TaplTestsPersistent, TaplTestsTransient
Fixes: 270395798
Change-Id: I4ecf5ddcd1206e846538175c684043c5e065fd5d
2023-12-06 22:13:10 +00:00
Pat Manning 4c27e8c6f0 Migrate cursor feature flag to trunk stable flag.
Fix: 300054410
Test: TaplTestsTransientTaskbar, TaplTestsQuickstep
Flag: enableCursorHoverStates
Change-Id: I5c320e0fd2bdd2ed39b00b62b1399e163c3384e7
2023-10-20 12:17:36 +01:00
Liran Binyamin d7f1942d4a Let the bubble bar handle gestures over the bubble bar.
This change introduces a motion event flag to signal that the gesture
is being originated over the bubble bar (similar to the nav bar gesture flag). Downstream consumers use this flag to ignore the event in order
to allow the bubble bar to handle it.

The black screen in b/293348900 seemed to be related to the recents
shell transition closing the app that was in the foreground before
swiping on the bubble bar handle. Not sure why it ended up with a black
screen, but this change avoids starting the recents transition entirely.

Demo: http://recall/-/bJtug1HhvXkkeA4MQvIaiP/BSxLROoflr1i2yy0v6Y4G

Fixes: 294421126
Bug: 293348900
Test: Manual:
      - Add bubble to the bubble bar
      - Swipe up over the bubble bar
      - Observe that the bubble bar expands

      - Launch application
      - Swipe up on the bubble bar handle
      - Observe that the bubble bar expands

Change-Id: Iea15829de97edb6bfbfb7007388865230faaf736
2023-09-26 12:02:27 -04:00
Andy Wickham 136bdf80b3 Merge "Add some gesture logs" into udc-qpr-dev am: 66072ca559 am: c18764fce1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24755061

Change-Id: I02949308dda86a905029fdcc21dcfb80dd91e3b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 01:27:39 +00:00
Tony Wickham 8e735c8234 Add some gesture logs
- Log when a DelegateInputConsumer becomes active
- Add reason for NavHandleLongPressInputConsumer
- Fixed typo

Test: adb shell dumpsys activity service TouchInteractionService
locally and verify logs
Flag: ENABLE_LONG_PRESS_NAV_HANDLE
Bug: 300247322

Change-Id: Ie2cdc8f4bfc8a6c794536871e714ff913f36f46f
2023-09-18 16:34:20 +00:00
Pat Manning c49d60b946 Migrate ENABLE_CURSOR_HOVER_STATES to aconfig
- Keeping FeatureFlags.ENABLE_CURSOR_HOVER_STATES for local testing until aconfig is available in FlagFlipper
- Still reference ENABLE_CURSOR_HOVER_STATES in tests as aconfig still can't be mocked

Bug: 300054410
Test: manual
Change-Id: Id385e8ee32ccf8b920b9b7f9cc620af32def589f
2023-09-14 11:08:02 +01:00
Pat Manning 3447016c66 Check taskbar stash state for hover only on hover events.
Fix: 293419351
Test: TaplTestsTransientTaskbar.
Flag: ENABLE_CURSOR_HOVER_STATES
Change-Id: I86d166d71dc5d41a7c4e450584e8948db96bf199
2023-08-18 14:45:48 +00:00
Jon Miranda a625f58737 Add dynamic thresholds for taskbar based on screen size.
Bug: 274467454
Test: Manually test that each threshold is as expected
Change-Id: Ifa66cfb78f544bb4d14391e70badc92589d47a26
2023-08-04 14:35:56 -07:00
patmanning 2c1860e8c6 Sends user home when stashed taskbar handle is clicked.
TAPL, see: go/tapl-taskbar-hover-states

Fix: 249852605
Test: TaplTestsTransientTaskbar
Flag: ENABLE_CURSOR_HOVER_STATES
Change-Id: If3c31b9b43a7361bc4e1a97395486249a44ad0f6
2023-07-05 22:18:01 +01:00
Mady Mellor 6dea6d1624 Modify Taskbar code to accommodate bubble bar gesture to stash/unstash
* Bubble bar typically follows the behavior of taskbar - if taskbar
  is shown, the bubble bar is shown, if taskbar hides, bubble bar
  hides.
* The bubble bar has 3 states: stashed, collapsed (unstashed but
  the bubbles are not expanded), and expanded. When bubbles are
  expanded, this means WMShell is rendering the bubble
  expanded view. In this situation taskbar becomes collapsed.

Bug: 253318833
Test: manual - flag turned on - see go/bubble-bar-tests
Test: manual - flag turned off:
             - launch an app, ensure taskbar is stashed
             - unstash taskbar, drag down on taskbar, ensure it
               becomes stashed
             - be in an app, unstash taskbar, interact with the app,
               ensure taskbar is stashed
             - be in an app, unstash taskbar, select an app from it,
               ensure taskbar is stashed & app is opened
Flag: WM_BUBBLE_BAR
Change-Id: I7b481d768182c8429160ab4a9b213b885a7d78bc
2023-05-23 14:02:50 -07:00
Tony Wickham 8d402efac2 Merge "Consistently multiply touch slop for InputConsumers" into udc-dev 2023-05-11 23:21:33 +00:00
Mady Mellor 662787540c Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"
This reverts commit 7344766886.

Reason for revert: b/282035015

Change-Id: I38db287f730048d3e1e5041f1853bdae214e1a66
2023-05-11 18:50:35 +00:00
Tony Wickham 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
Mady Mellor 7344766886 Modify Taskbar code to accommodate bubble bar gesture to stash/unstash
* Bubble bar typically follows the behavior of taskbar - if taskbar
  is shown, the bubble bar is shown, if taskbar hides, bubble bar
  hides.
* The bubble bar has 3 states: stashed, collapsed (unstashed but
  the bubbles are not expanded), and expanded. When bubbles are
  expanded, this means WMShell is rendering the bubble
  expanded view. In this situation taskbar becomes collapsed.

Bug: 253318833
Test: manual, with other CLs, see go/bubble-bar-tests
Flag: WM_BUBBLE_BAR
Change-Id: Ic210c382e7482c259ae543a0dc083fe9305cbf5b
2023-05-09 12:37:14 -07:00
Qiao Yang 2482c8dcd4 Revert "Revert "Listen for hover events over stashed taskbar.""
This reverts commit c27605099c.

Reason for revert: DroidMonitor-triggered revert due to breakage <https://android-build.googleplex.com/builds/quarterdeck?branch=git_udc-dev&target=cf_x86_64_phone-userdebug&lkgb=10076607&lkbb=10076982&fkbb=10076788>, bug <281093059>

Change-Id: I71e7fd07232c27a004243df0ffb0457fe53fe13b
2023-05-05 19:07:17 +00:00
Pat Manning c27605099c Revert "Listen for hover events over stashed taskbar."
This reverts commit c5882bcdfc.

Reason for revert: b/281068877

Change-Id: I431678658fc464c995df0df5e3cac5491d91b052
2023-05-05 17:22:21 +00:00
Pat Manning c5882bcdfc Listen for hover events over stashed taskbar.
Bug: 243191650
Test: TaplTestsTaskbar
Flag: ENABLE_CURSOR_HOVER_STATES
Change-Id: Ia189ac6a6097d073c40c69ead6ecaf398d22eba8
2023-05-04 20:35:44 +01:00