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: Ifd2c8be17ad777fd2c1519dd16ca70b3d6da5e86
This commit is contained in:
Hongwei Wang authored and Automerger Merge Worker committed 2021-02-27 00:22:56 +00:00
commit f562a9689b
1 file changed
+3 -1
@@ -1746,7 +1746,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
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());
}