From 6152c902ed6e699aeab78426b0d704b7a4e5279a Mon Sep 17 00:00:00 2001
From: Jeremy Sim <jeremysim@google.com>
Date: Fri, 10 Mar 2023 15:38:18 -0800
Subject: [PATCH] Fix two issues with splitting from Taskbar

This patch fixes two issues that would arise when the user initiated split from Taskbar:
1) The Overview Actions View would animate out, then erroneously pop back in.
2) When initiating split from home repeatedly, the task thumbnail grid would not animate downward properly, instead staying in the wrong y-position.

Both issues were caused by the fact that we now have a new way to enter OverviewSplitSelect (directly from Taskbar/Home), which rendered some of our old assumptions incorrect. Namely:
1) When we finish transitioning to OverviewSplitSelect, we need to update OverviewActionsView visibility so that it stays hidden.
2) mSplitHiddenTaskView is no longer a good way to tell if we are in split select state or not.

Fixed by adding a new call to updateCurrentTaskActionsVisibility() to the end of the split staging animation, and by making sure translations get reset every time resetFromSplitSelect() is called.

Fixes: 271624078
Fixes: 261544937
Test: Manual, verified on large and small tablet screens with various types of split invocations and rotation combinations.

Change-Id: Ied0f4818ce6da599845ccd07e9dc96ef4ba030c3
---
 .../src/com/android/quickstep/views/RecentsView.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 614ef81add..4ba02769a5 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -3166,6 +3166,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 InteractionJankMonitorWrapper.cancel(
                         InteractionJankMonitorWrapper.CUJ_SPLIT_SCREEN_ENTER);
             }
+
+            updateCurrentTaskActionsVisibility();
         });
     }
 
@@ -4666,6 +4668,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             mSecondSplitHiddenView = null;
         }
 
+        // We are leaving split selection state, so it is safe to reset thumbnail translations for
+        // the next time split is invoked.
+        setTaskViewsPrimarySplitTranslation(0);
+        setTaskViewsSecondarySplitTranslation(0);
+
         if (mSplitHiddenTaskViewIndex == -1) {
             return;
         }
@@ -4680,11 +4687,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         }
         onLayout(false /*  changed */, getLeft(), getTop(), getRight(), getBottom());
 
-        // We are leaving split selection state, so it is safe to reset thumbnail translations for
-        // the next time split is invoked.
-        setTaskViewsPrimarySplitTranslation(0);
-        setTaskViewsSecondarySplitTranslation(0);
-
         resetTaskVisuals();
         mSplitHiddenTaskViewIndex = -1;
         if (mSplitHiddenTaskView != null) {