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

Commit f1abed23 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Update back-gesture-allowed state before calling state change callback" into main

parents 138922e9 0d4f3d72

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

+3 −1
Original line number Diff line number Diff line
@@ -500,11 +500,13 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
        final boolean previousForcedVisible = mIsButtonForcedVisible;

        mIsButtonForcedVisible =

                mGestureNavigationSettingsObserver.areNavigationButtonForcedVisible();

        // Update this before calling mButtonForcedVisibleCallback since NavigationBar will relayout

        // and query isHandlingGestures() as a part of the callback

        mIsBackGestureAllowed = !mIsButtonForcedVisible;

        if (previousForcedVisible != mIsButtonForcedVisible

                && mButtonForcedVisibleCallback != null) {

            mButtonForcedVisibleCallback.accept(mIsButtonForcedVisible);

        }

        mIsBackGestureAllowed = !mIsButtonForcedVisible;



        final DisplayMetrics dm = res.getDisplayMetrics();

        final float defaultGestureHeight = res.getDimension(