am f223babb: Merge "Canceling ViewPropertyAnimator now removes pending actions" into lmp-dev

* commit 'f223babba9435874111d031610aad1968bcdec0b': Canceling ViewPropertyAnimator now removes pending actions
2014-08-28 16:53:24 +00:00
parent b750b75541 06c34e7cbe
commit d23388fd31
1 changed files with 4 additions and 0 deletions
--- a/core/java/android/view/ViewPropertyAnimator.java
+++ b/core/java/android/view/ViewPropertyAnimator.java
@@ -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();