commit bc55b29cfe627e41f149751960d9e0f8da121a47
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 31 15:27:08 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 31 15:27:08 2023 +0000
tree c0e86f1ca229bf4381a53387c3a776d802a52878
parent b793def6abfa43bda22fd7eb6d94b90fbc4038ba
parent f3e9f870bd00bf7f6e6ec512f0f5b0f4a211d3db

Merge "Fix task bar unstashing and stashing when triggering back gesture using the trackpad" into udc-dev

quickstep/src/com/android/quickstep/BaseActivityInterface.java

diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index ce41c60..fd7aa58 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -16,6 +16,7 @@
 package com.android.quickstep;
 
 import static com.android.launcher3.LauncherAnimUtils.VIEW_BACKGROUND_COLOR;
+import static com.android.launcher3.MotionEventsUtils.isTrackpadMultiFingerSwipe;
 import static com.android.launcher3.anim.Interpolators.ACCEL_2;
 import static com.android.launcher3.anim.Interpolators.INSTANT;
 import static com.android.launcher3.anim.Interpolators.LINEAR;
@@ -187,7 +188,8 @@
     public abstract boolean allowMinimizeSplitScreen();
 
     public boolean deferStartingActivity(RecentsAnimationDeviceState deviceState, MotionEvent ev) {
-        return deviceState.isInDeferredGestureRegion(ev) || deviceState.isImeRenderingNavButtons();
+        return deviceState.isInDeferredGestureRegion(ev) || deviceState.isImeRenderingNavButtons()
+                || isTrackpadMultiFingerSwipe(ev);
     }
 
     /**