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

Commit 44e788a9 authored by Vinit Nayak's avatar Vinit Nayak Committed by Android (Google) Code Review
Browse files

Merge "Prevent restoring split selection state for fallback overview" into tm-qpr-dev

parents 7798fb6e 392f8878

quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java

+3 −0
Original line number Diff line number Diff line
@@ -243,6 +243,9 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity, RecentsSta 
        if (finalState != MODAL_TASK) {

            setOverviewSelectEnabled(false);

        }

        if (finalState != OVERVIEW_SPLIT_SELECT) {

            resetFromSplitSelectionState();

        }



        if (isOverlayEnabled) {

            runActionOnRemoteHandles(remoteTargetHandle ->

quickstep/src/com/android/quickstep/fallback/RecentsState.java

+2 −1
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ public class RecentsState implements BaseState<RecentsState> { 
    public static final RecentsState HOME = new RecentsState(3, 0);

    public static final RecentsState BG_LAUNCHER = new LauncherState(4, 0);

    public static final RecentsState OVERVIEW_SPLIT_SELECT = new RecentsState(5,

            FLAG_SHOW_AS_GRID | FLAG_SCRIM | FLAG_OVERVIEW_UI | FLAG_CLOSE_POPUPS);

            FLAG_SHOW_AS_GRID | FLAG_SCRIM | FLAG_OVERVIEW_UI | FLAG_CLOSE_POPUPS

                    | FLAG_DISABLE_RESTORE);



    public final int ordinal;

    private final int mFlags;