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

Commit 8715dbb8 authored by Michal Brzezinski's avatar Michal Brzezinski
Browse files

Disabling trackpad back gesture when SYSUI_STATE_TOUCHPAD_GESTURES_DISABLED is set 

Flag: NONE trivial change and while not directly flagged, usage of SYSUI_STATE_TOUCHPAD_GESTURES_DISABLED state is guarded by flag: com.android.systemui.new_touchpad_gestures_tutorial
Bug: 345207568
Test: manual - check trackpad back gesture disabled when flag set
Change-Id: I227b0229e03be9cb6bb706f9f5d0506be780513b
parent 07a810f0

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

+5 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static com.android.systemui.Flags.edgebackGestureHandlerGetRunningTasksBa 
import static com.android.systemui.classifier.Classifier.BACK_GESTURE;

import static com.android.systemui.navigationbar.gestural.Utilities.isTrackpadScroll;

import static com.android.systemui.navigationbar.gestural.Utilities.isTrackpadThreeFingerSwipe;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TOUCHPAD_GESTURES_DISABLED;



import static java.util.stream.Collectors.joining;
@@ -1021,8 +1022,10 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
            if (mIsTrackpadThreeFingerSwipe) {

                // Trackpad back gestures don't have zones, so we don't need to check if the down

                // event is within insets.

                mAllowGesture = isBackAllowedCommon && isValidTrackpadBackGesture(

                        true /* isTrackpadEvent */);

                boolean trackpadGesturesEnabled =

                        (mSysUiFlags & SYSUI_STATE_TOUCHPAD_GESTURES_DISABLED) == 0;

                mAllowGesture = isBackAllowedCommon && trackpadGesturesEnabled

                        && isValidTrackpadBackGesture(true /* isTrackpadEvent */);

            } else {

                mAllowGesture = isBackAllowedCommon && !mUsingThreeButtonNav && isWithinInsets

                    && isWithinTouchRegion((int) ev.getX(), (int) ev.getY())