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

Commit d8e2db1d authored by Matthew Ng's avatar Matthew Ng
Browse files

Only toggle launcher stability flag when prototype is enabled 

Change-Id: I2b9e910547c8c884350e011f3c660e014e5587aa
Fixes: 122897468
Test: manual
parent e49bb322

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationGestureAction.java

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.view.WindowManagerPolicyConstants.NAV_BAR_LEFT; 
import static android.view.WindowManagerPolicyConstants.NAV_BAR_RIGHT;



import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_NONE;

import static com.android.systemui.statusbar.phone.NavigationPrototypeController.PROTOTYPE_ENABLED;



import android.annotation.NonNull;

import android.content.Context;
@@ -84,7 +85,7 @@ public abstract class NavigationGestureAction { 


        // Tell launcher that this action requires a stable task list or not

        boolean flag = requiresStableTaskList();

        if (flag != sLastTaskStabilizationFlag) {

        if (getGlobalBoolean(PROTOTYPE_ENABLED) && flag != sLastTaskStabilizationFlag) {

            Settings.Global.putInt(mNavigationBarView.getContext().getContentResolver(),

                    ENABLE_TASK_STABILIZER_FLAG, flag ? 1 : 0);

            sLastTaskStabilizationFlag = flag;

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationPrototypeController.java

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ public class NavigationPrototypeController extends ContentObserver { 


    private final String GESTURE_MATCH_SETTING = "quickstepcontroller_gesture_match_map";

    public static final String NAV_COLOR_ADAPT_ENABLE_SETTING = "navbar_color_adapt_enable";

    public static final String PROTOTYPE_ENABLED = "prototype_enabled";



    @Retention(RetentionPolicy.SOURCE)

    @IntDef({ACTION_DEFAULT, ACTION_QUICKSTEP, ACTION_QUICKSCRUB, ACTION_BACK,