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

2022-03-22 00:17:43 +00:00
parent 8746367f40 b4b79142d8
commit 7a84442436
1 changed files with 5 additions and 2 deletions
@@ -1008,8 +1008,11 @@ public class TaskView extends FrameLayout implements Reusable {
        // 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();