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

Commit ff75c4fe authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixing allSet page not closed if recentsAnimation takes time to start"... 

Merge "Fixing allSet page not closed if recentsAnimation takes time to start" into sc-v2-dev am: ef18f8c5

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

Change-Id: Ie168c6b5d955b9839f6d48b3204d9f62ed67cd90
parents 55bef3bd ef18f8c5

quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java

+2 −4
Original line number Diff line number Diff line
@@ -153,10 +153,8 @@ public class ProgressDelegateInputConsumer implements InputConsumer, 


        ObjectAnimator anim = mProgress.animateToValue(endValue);

        anim.setDuration(duration).setInterpolator(scrollInterpolatorForVelocity(velocity));

        if (mRecentsAnimationController != null) {

        anim.addListener(AnimatorListeners.forSuccessCallback(

                () -> mStateCallback.setState(STATE_FLING_FINISHED)));

        }

        anim.start();

    }

quickstep/src/com/android/quickstep/interaction/AllSetActivity.java

+3 −0
Original line number Diff line number Diff line
@@ -136,6 +136,9 @@ public class AllSetActivity extends Activity { 
    protected void onPause() {

        super.onPause();

        clearBinderOverride();

        if (mSwipeProgress.value >= 1) {

            finishAndRemoveTask();

        }

    }



    private void clearBinderOverride() {