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

Commit ef18f8c5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 1c79327f beefd189

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