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

Commit 34041385 authored by Andy Wickham's avatar Andy Wickham
Browse files

Forces a back region for sandbox even if gesture nav is disabled. 

When gesture nav is disabled, this config value returns 0,
preventing the back gesture from being recognized.
Probably we won't show the sandbox in that case, but it'd
be good to have a reasonable fallback just in case.

Bug: 186715828
Test: Manual with gesture nav enabled and disabled
Change-Id: Ic5e03bede80521670f81e6ac7b02f364259b9f96
parent 53a44a2e

quickstep/src/com/android/quickstep/interaction/EdgeBackGestureHandler.java

+6 −3
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.view.ViewGroup.LayoutParams; 
import androidx.annotation.Nullable;



import com.android.launcher3.ResourceUtils;

import com.android.launcher3.Utilities;



/**

 * Utility class to handle edge swipes for back gestures.
@@ -47,9 +48,9 @@ public class EdgeBackGestureHandler implements OnTouchListener { 
    private final Point mDisplaySize = new Point();



    // The edge width where touch down is allowed

    private int mEdgeWidth;

    private final int mEdgeWidth;

    // The bottom gesture area height

    private int mBottomGestureHeight;

    private final int mBottomGestureHeight;

    // The slop to distinguish between horizontal and vertical motion

    private final float mTouchSlop;

    // Duration after which we consider the event as longpress.
@@ -97,7 +98,9 @@ public class EdgeBackGestureHandler implements OnTouchListener { 


        mBottomGestureHeight =

            ResourceUtils.getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, res);

        mEdgeWidth = ResourceUtils.getNavbarSize("config_backGestureInset", res);

        int systemBackRegion = ResourceUtils.getNavbarSize("config_backGestureInset", res);

        // System back region is 0 if gesture nav is not currently enabled.

        mEdgeWidth = systemBackRegion == 0 ? Utilities.dpToPx(18) : systemBackRegion;

    }



    void setViewGroupParent(@Nullable ViewGroup parent) {