commit 4dbf14ed67cc4caecaf89f3919123f31fd2d3b65
author Hongwei Wang <hwwang@google.com> Sat Feb 27 00:23:10 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 27 00:23:10 2021 +0000
tree fcab0fdd8f8f67d8b01ca52bfe1cca3c1c45c038
parent f24193059e3ab20b6cc6647701ceb75e5fbb8c15
parent 4f3e8ef3f2162badd96cac6cd18640a4ec4568c9

Merge "Skip window transform if SwipePipToHomeAnimator's running" into sc-dev am: 4f3e8ef3f2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13714585

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie05a0c289d88aeef487aff19bf04938926cc3958

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());
             }