commit 7a84442436f3c396f69e2d10a1275c0cb0b3c67f
author Jeremy Sim <jeremysim@google.com> Tue Mar 22 00:17:43 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 22 00:17:43 2022 +0000
tree ed9636d7b70c3623fb134c29fe45533f977f4c09
parent 8746367f4035bb4304c48764b2498552493a02fb
parent b4b79142d8fd5200191039138ac28617807a090d

Merge "Fix UI overlap when rotating in split select mode" into tm-dev

quickstep/src/com/android/quickstep/views/TaskView.java

diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 1d621dc..bf817ec 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -1008,8 +1008,11 @@
         // resetViewTransforms is called during Quickswitch scrolling.
         mDismissTranslationX = mTaskOffsetTranslationX =
                 mTaskResistanceTranslationX = mSplitSelectTranslationX = mGridEndTranslationX = 0f;
-        mDismissTranslationY = mTaskOffsetTranslationY = mTaskResistanceTranslationY =
-                mSplitSelectTranslationY = 0f;
+        mDismissTranslationY = mTaskOffsetTranslationY = mTaskResistanceTranslationY = 0f;
+        if (getRecentsView() == null || !getRecentsView().isSplitSelectionActive()) {
+            mSplitSelectTranslationY = 0f;
+        }
+
         setSnapshotScale(1f);
         applyTranslationX();
         applyTranslationY();