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

This commit is contained in:
Hongwei Wang authored and Android (Google) Code Review committed 2021-02-27 00:05:05 +00:00
commit 4f3e8ef3f2
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());
}