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

Commit 617f9fae authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Avoiding updating task via scroll if RectF spring animation is running 

Bug: 231333965
Test: Verified no update at the end of home transition
Change-Id: I2a106f4d7661f9d409425ce2ed755e74e1abe14b
parent 29405655

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

+6 −4
Original line number Diff line number Diff line
@@ -1996,9 +1996,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
     * Applies the transform on the recents animation

     */

    protected void applyScrollAndTransform() {

        // No need to apply any transform if there is ongoing swipe-pip-to-home animator since

        // that animator handles the leash solely.

        boolean notSwipingPipToHome = mRecentsAnimationTargets != null && !mIsSwipingPipToHome;

        // No need to apply any transform if there is ongoing swipe-to-home animator

        //    swipe-to-pip handles the leash solely

        //    swipe-to-icon animation is handled by RectFSpringAnim anim

        boolean notSwipingToHome = mRecentsAnimationTargets != null

                && mGestureState.getEndTarget() != HOME;

        boolean setRecentsScroll = mRecentsViewScrollLinked && mRecentsView != null;

        for (RemoteTargetHandle remoteHandle : mRemoteTargetHandles) {

            AnimatorControllerWithResistance playbackController =
@@ -2008,7 +2010,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                        getScaleProgressDueToScroll()), mDragLengthFactor);

            }



            if (notSwipingPipToHome) {

            if (notSwipingToHome) {

                TaskViewSimulator taskViewSimulator = remoteHandle.getTaskViewSimulator();

                if (setRecentsScroll) {

                    taskViewSimulator.setScroll(mRecentsView.getScrollOffset());