| commit | 870447623593a6b3cea1c60457035882d2252f81 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Jun 06 03:03:33 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 06 03:03:33 2023 +0000 |
| tree | fc8c3ccb867f2578ae402775fd14adec8cd4ae6f | |
| parent | 4acd0863ac7a0829ba2c5d32afae21228b96c55a [diff] | |
| parent | 39748f8883055f276f6cd5e4987629f8d7a3e16b [diff] |
Merge "Don't allow Taskbar unstash during Assistant gesture" into udc-dev am: e2a6113e93 am: 39748f8883 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23565985 Change-Id: I26e34597aa96c2eb304ef40404b4492faf7f1074 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index 06ab619..c18dca9 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -900,9 +900,9 @@ base = tryCreateAssistantInputConsumer(base, newGestureState, event, reasonString); } - // If Taskbar is present, we listen for long press or cursor hover events to unstash it. + // If Taskbar is present, we listen for swipe or cursor hover events to unstash it. TaskbarActivityContext tac = mTaskbarManager.getCurrentActivityContext(); - if (tac != null) { + if (tac != null && !(base instanceof AssistantInputConsumer)) { // Present always on large screen or on small screen w/ flag DeviceProfile dp = tac.getDeviceProfile(); boolean useTaskbarConsumer = dp.isTaskbarPresent && !TaskbarManager.isPhoneMode(dp)