commit 4f3e8ef3f2162badd96cac6cd18640a4ec4568c9
author Hongwei Wang <hwwang@google.com> Sat Feb 27 00:05:05 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Feb 27 00:05:05 2021 +0000
tree cf2edf2eaba7f90d5a0f9a805597a4860480e44d
parent 023657ec219686dbd990fcd66e0812f8ce3f0acc
parent 9140af12d2dc2335cd76b9313cd1a41e7852376f

Merge "Skip window transform if SwipePipToHomeAnimator's running" into sc-dev

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index feeee50..7a259d4 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1746,7 +1746,9 @@
         if (mWindowTransitionController != null) {
             mWindowTransitionController.setProgress(mCurrentShift.value, mDragLengthFactor);
         }
-        if (mRecentsAnimationTargets != null) {
+        // No need to apply any transform if there is ongoing swipe-pip-to-home animator since
+        // that animator handles the leash solely.
+        if (mRecentsAnimationTargets != null && !mIsSwipingPipToHome) {
             if (mRecentsViewScrollLinked) {
                 mTaskViewSimulator.setScroll(mRecentsView.getScrollOffset());
             }