commit dbd3c09623ab89b76782cae4eb05cf965217a500
author Tracy Zhou <tracyzhou@google.com> Sun Oct 13 14:48:44 2024 -0700
committer Tracy Zhou <tracyzhou@google.com> Sun Oct 13 15:53:41 2024 -0700
tree b219d79ece02315ec0752c58198f978e6ff27dd9
parent 093cf62e69c2a1060b14d06afd932a6d7f775431

Disallow 2-finger swipe from the corners to trigger assistant from trackpad

Bug: 358337581
Test: manual
Flag: EXEMPT bugfix
Change-Id: I62994afe0e3edaaa990f58b44b87efa16f0580ec

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 5131774..99d48aa 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();
     }