From dae18892a2865d59ff5b7e100dffcc617443e396 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Wed, 17 May 2023 18:01:53 -0700
Subject: [PATCH] Disallow two finger edge swipe back

Back gesture is a 3-finger gesture. Currently because a two-finger swipe is recognized as if it's a motion event from on the screen, it triggers edge swipe when the cursor is in the zone. We don't want to allow this behavior

Bug: 283112069
Test: manual
Change-Id: I6b6955fe1f290a7c117986f7b72e31ecc23d04e9
---
 .../navigationbar/gestural/EdgeBackGestureHandler.java     | 4 +++-
 .../android/systemui/navigationbar/gestural/Utilities.java | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
index 6dbc9baa8bb5a..bbc86c839ad22 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
@@ -22,6 +22,7 @@ import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_EXCLUDE_FROM_
 import static com.android.systemui.classifier.Classifier.BACK_GESTURE;
 import static com.android.systemui.navigationbar.gestural.Utilities.isTrackpadFourFingerSwipe;
 import static com.android.systemui.navigationbar.gestural.Utilities.isTrackpadMultiFingerSwipe;
+import static com.android.systemui.navigationbar.gestural.Utilities.isTrackpadScroll;
 
 import android.annotation.NonNull;
 import android.app.ActivityManager;
@@ -1011,7 +1012,8 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
             boolean isWithinInsets = isWithinInsets((int) ev.getX(), (int) ev.getY());
             boolean isBackAllowedCommon = !mDisabledForQuickstep && mIsBackGestureAllowed
                     && !mGestureBlockingActivityRunning
-                    && !QuickStepContract.isBackGestureDisabled(mSysUiFlags);
+                    && !QuickStepContract.isBackGestureDisabled(mSysUiFlags)
+                    && !isTrackpadScroll(mIsTrackpadGestureFeaturesEnabled, ev);
             if (isTrackpadMultiFingerSwipe) {
                 // Trackpad back gestures don't have zones, so we don't need to check if the down
                 // event is within insets.
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/Utilities.java b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/Utilities.java
index 50e8aa7b20469..bf5e4423ff383 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/Utilities.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/Utilities.java
@@ -17,11 +17,18 @@
 package com.android.systemui.navigationbar.gestural;
 
 import static android.view.MotionEvent.CLASSIFICATION_MULTI_FINGER_SWIPE;
+import static android.view.MotionEvent.CLASSIFICATION_TWO_FINGER_SWIPE;
 
 import android.view.MotionEvent;
 
 public final class Utilities {
 
+    public static boolean isTrackpadScroll(boolean isTrackpadGestureFeaturesEnabled,
+            MotionEvent event) {
+        return isTrackpadGestureFeaturesEnabled
+                && event.getClassification() == CLASSIFICATION_TWO_FINGER_SWIPE;
+    }
+
     public static boolean isTrackpadMultiFingerSwipe(boolean isTrackpadGestureFeaturesEnabled,
             MotionEvent event) {
         return isTrackpadGestureFeaturesEnabled