| commit | 74ebb2f7f9758d9d15bb11e40f7b99282f86c382 | [log] [tgz] |
|---|---|---|
| author | Tracy Zhou <tracyzhou@google.com> | Sat Jun 10 21:20:28 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jun 10 21:20:28 2023 +0000 |
| tree | cfb4616d47167f63b3c0a629a46e74a40db1fea8 | |
| parent | d8028fa72211c9ca9dac010650f24343a9e7883d [diff] | |
| parent | db6d5e186bab5d3e08a7d41f45eafb1afaee69bc [diff] |
Merge "Guard TrackpadStatusBarInputConsumer with canStartSystemGesture" into udc-qpr-dev am: a6909d121a am: db6d5e186b Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23620517 Change-Id: Iaeababcf8ff14429008d4b7d5714e03b76872466 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 c18dca9..c8af252 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -936,7 +936,7 @@ } if (ENABLE_TRACKPAD_GESTURE.get() && mGestureState.isTrackpadGesture() - && !previousGestureState.isRecentsAnimationRunning()) { + && canStartSystemGesture && !previousGestureState.isRecentsAnimationRunning()) { reasonString = newCompoundString(reasonPrefix) .append(SUBSTRING_PREFIX) .append("Trackpad 3-finger gesture, using TrackpadStatusBarInputConsumer");