commit ada58203ad9f6a8a2dcb751f6202ac1371c66788
author Tracy Zhou <tracyzhou@google.com> Tue Oct 15 17:30:53 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 15 17:30:53 2024 +0000
tree d34b86ded7a9e8957dd63461012302a8af741fec
parent dc4f56040a19e5346d778dd02110d7ade90d22ba
parent dbd3c09623ab89b76782cae4eb05cf965217a500

Merge "Disallow 2-finger swipe from the corners to trigger assistant from trackpad" into main

quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 2fa201d..de8be50 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -19,6 +19,7 @@
 import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
 import static android.view.Display.DEFAULT_DISPLAY;
 
+import static com.android.launcher3.MotionEventsUtils.isTrackpadScroll;
 import static com.android.launcher3.util.DisplayController.CHANGE_ALL;
 import static com.android.launcher3.util.DisplayController.CHANGE_NAVIGATION_MODE;
 import static com.android.launcher3.util.DisplayController.CHANGE_ROTATION;
@@ -563,6 +564,7 @@
         return mAssistantAvailable
                 && !QuickStepContract.isAssistantGestureDisabled(mSystemUiStateFlags)
                 && mRotationTouchHelper.touchInAssistantRegion(ev)
+                && !isTrackpadScroll(ev)
                 && !isLockToAppActive();
     }