| commit | 37ba5dd02551b06d46d0c1ae067ac4d85984bf39 | [log] [tgz] |
|---|---|---|
| author | Andreas Agvard <agvard@google.com> | Sat Aug 19 09:50:07 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Aug 19 09:50:07 2023 +0000 |
| tree | 38ecc332712da85f36c709d9480ef695fde9d6fe | |
| parent | 3744f3713ce6067fe3c8566bdb89d72937e91ab2 [diff] | |
| parent | 31689cad69bbd6a08e228b2ef6ef5c2d2faae859 [diff] |
Merge "Prevent long press nav handle invocation when quick switching between apps." into udc-qpr-dev am: 31689cad69 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24483110 Change-Id: I0996c639d301f253fad780a6396e71d3c5bf1e73 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 7a9f88a..79c7329 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -914,7 +914,8 @@ base = new TaskbarUnstashInputConsumer(this, base, mInputMonitorCompat, tac, mOverviewCommandHelper); } - } else if (canStartSystemGesture && FeatureFlags.ENABLE_LONG_PRESS_NAV_HANDLE.get()) { + } else if (canStartSystemGesture && FeatureFlags.ENABLE_LONG_PRESS_NAV_HANDLE.get() + && !previousGestureState.isRecentsAnimationRunning()) { base = new NavHandleLongPressInputConsumer(this, base, mInputMonitorCompat); }