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

Commit 593ac556 authored by Peter Kalauskas's avatar Peter Kalauskas Committed by Android (Google) Code Review
Browse files

Merge "Introduce a flag for new back affordance" into tm-qpr-dev

parents f81f314c 6acb1cfd

packages/SystemUI/src/com/android/systemui/flags/Flags.java

+2 −0
Original line number Diff line number Diff line
@@ -194,6 +194,8 @@ public class Flags { 
    public static final SysPropBooleanFlag WM_ALWAYS_ENFORCE_PREDICTIVE_BACK =

            new SysPropBooleanFlag(1202, "persist.wm.debug.predictive_back_always_enforce", false);



    public static final BooleanFlag NEW_BACK_AFFORDANCE = new BooleanFlag(1203, true);



    // Pay no attention to the reflection behind the curtain.

    // ========================== Curtain ==========================

    // |                                                           |

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

+3 −4
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker 
    private boolean mIsBackGestureAllowed;

    private boolean mGestureBlockingActivityRunning;

    private boolean mIsInPipMode;

    private boolean mIsPredictiveBackAnimEnabled;

    private boolean mIsNewBackAffordanceEnabled;



    private InputMonitor mInputMonitor;

    private InputChannelCompat.InputEventReceiver mInputEventReceiver;
@@ -524,8 +524,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker 
                    Choreographer.getInstance(), this::onInputEvent);



            // Add a nav bar panel window

            mIsPredictiveBackAnimEnabled =

                    mFeatureFlags.isEnabled(Flags.WM_ENABLE_PREDICTIVE_BACK_ANIM);

            mIsNewBackAffordanceEnabled = mFeatureFlags.isEnabled(Flags.NEW_BACK_AFFORDANCE);

            resetEdgeBackPlugin();

            mPluginManager.addPluginListener(

                    this, NavigationEdgeBackPlugin.class, /*allowMultiple=*/ false);
@@ -545,7 +544,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker 
    }



    private void resetEdgeBackPlugin() {

        if (mIsPredictiveBackAnimEnabled) {

        if (mIsNewBackAffordanceEnabled) {

            setEdgeBackPlugin(

                    mBackPanelControllerFactory.create(mContext, mBackAnimation));

        } else {