From 392f8878cd1c6cdc042a0cc2546579dbd7b4e160 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Mon, 17 Oct 2022 17:52:16 -0700
Subject: [PATCH] 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
---
 .../com/android/quickstep/fallback/FallbackRecentsView.java    | 3 +++
 quickstep/src/com/android/quickstep/fallback/RecentsState.java | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
index e32aaee532..67e0bea522 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
@@ -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 ->
diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsState.java b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
index 223eba5b95..8b5f091e11 100644
--- a/quickstep/src/com/android/quickstep/fallback/RecentsState.java
+++ b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
@@ -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;