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

Commit 1b499bfd authored by Ats Jenk's avatar Ats Jenk Committed by Android (Google) Code Review
Browse files

Merge "Add a flag to not disable back gesture in launcher" into tm-qpr-dev

parents 4093307b 8121e0d8

src/com/android/launcher3/Launcher.java

+10 −0
Original line number Diff line number Diff line
@@ -313,6 +313,12 @@ public class Launcher extends StatefulActivity<LauncherState> 
    private static final FloatProperty<Hotseat> HOTSEAT_WIDGET_SCALE =

            HOTSEAT_SCALE_PROPERTY_FACTORY.get(SCALE_INDEX_WIDGET_TRANSITION);



    private static final boolean DESKTOP_MODE_1_SUPPORTED =

            "1".equals(Utilities.getSystemProperty("persist.wm.debug.desktop_mode", "0"));



    private static final boolean DESKTOP_MODE_2_SUPPORTED =

            "1".equals(Utilities.getSystemProperty("persist.wm.debug.desktop_mode_2", "0"));



    @Thunk

    Workspace<?> mWorkspace;

    @Thunk
@@ -3154,6 +3160,10 @@ public class Launcher extends StatefulActivity<LauncherState> 
    }



    private void updateDisallowBack() {

        if (DESKTOP_MODE_1_SUPPORTED || DESKTOP_MODE_2_SUPPORTED) {

            // Do not disable back in launcher when prototype behavior is enabled

            return;

        }

        LauncherRootView rv = getRootView();

        if (rv != null) {

            boolean disableBack = getStateManager().getState() == NORMAL