Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a29db759 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Disallow two finger edge swipe back" into udc-qpr-dev

parents 16ba004f dae18892

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java

+3 −1
Original line number Diff line number Diff line
@@ -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.

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/Utilities.java

+7 −0
Original line number Diff line number Diff line
@@ -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