Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9140af12 authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Skip window transform if SwipePipToHomeAnimator's running 

Launcher tries to set the window transform on the recents animation
leash when it's settled on end target, which might conflict with
SwipePipToHomeAnimator and causes flash/flick at the end of the
transition. Simply skip the window transform since
SwipePipToHomeAnimator is the one solely responsible for updating the
leash in this case.

Bug: 179720719
Test: repeatedly enter PiP from ApiDemos with autoEnterPip enabled
Change-Id: Ia98675c21e3bd898cd11cf6ed97f6eaadcb11a42
parent d6844dcb

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

+3 −1
Original line number Diff line number Diff line
@@ -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());

            }