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

Commit 5637b7d2 authored by Chet Haase's avatar Chet Haase
Browse files

Canceling ViewPropertyAnimator now removes pending actions 

Normally, calling cancel() on ViewPropertyAnimator() will cancel any
running animations as well as any associated actions (layers and
start/end actions). But if the animation is canceled before the first
frame, these other actions are still pending and will not be canceled.

This fix also cancels these pending actions.

Issue #17296082 VPA.cancel() doesn't clear the end action

Change-Id: If104d21c1e2d64516500048a06ba217284732ef0
parent 98f8a046

core/java/android/view/ViewPropertyAnimator.java

+4 −0
Original line number Diff line number Diff line
@@ -430,6 +430,10 @@ public class ViewPropertyAnimator { 
            }

        }

        mPendingAnimations.clear();

        mPendingSetupAction = null;

        mPendingCleanupAction = null;

        mPendingOnStartAction = null;

        mPendingOnEndAction = null;

        mView.removeCallbacks(mAnimationStarter);

        if (mRTBackend != null) {

            mRTBackend.cancelAll();