Merge "Prevent restoring split selection state for fallback overview" into tm-qpr-dev am: 44e788a9d3

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20217203

Change-Id: Ic6df3639b6f34b17380980dfad46d7af5243e7ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vinit Nayak
2022-10-18 19:43:22 +00:00
committed by Automerger Merge Worker
2 changed files with 5 additions and 1 deletions

View File

@@ -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 ->

View File

@@ -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;