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

Commit 392f8878 authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Prevent restoring split selection state for fallback overview

* Add flag to explicitly not restore
OVERVIEW_SPLIT_SELECT
* FallbackRecentsView then resets state in
RecentsView if our endState is ever not split selection

Fixes: 253178217
Test: Used launcher developer option to
force use separate recents activity. Tested w/
3 button nav + gesture.

Change-Id: I26c9994bf853e9a005300a02aa143991958fc461
parent 126d1783
Loading
Loading
Loading
Loading
+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 ->
+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;