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

Commit 51cbd323 authored by Sunny Goyal's avatar Sunny Goyal Committed by Automerger Merge Worker
Browse files

Merge "Avoiding updating task via scroll if RectF spring animation is running"... 

Merge "Avoiding updating task via scroll if RectF spring animation is running" into tm-dev am: 689b0003 am: 57a95691

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



Change-Id: I63c8780cd914488282f1159037e3d6e31bbd87da
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dff1a938 57a95691

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