commit e8c8617c287d57bfeca89c6d3b9ca40d784a797b
author Yigit Boyar <yboyar@google.com> Wed Jun 25 00:30:05 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 23 21:50:10 2014 +0000
tree b7c0f15c50cc22197aecd7fefa6578ce052b78c4
parent d271c1c071a69f4e318c6b1e5c2940eb533ad738
parent de5a75ea91cdc9d56f2051aa6ef8e7c1b45febbb

Merge "Clone animators before running in StateListAnimator"

core/java/android/animation/StateListAnimator.java

diff --git a/core/java/android/animation/StateListAnimator.java b/core/java/android/animation/StateListAnimator.java
index bc4843d..810f050 100644
--- a/core/java/android/animation/StateListAnimator.java
+++ b/core/java/android/animation/StateListAnimator.java
@@ -141,7 +141,7 @@
             return;
         }
         if (mLastMatch != null) {
-            cancel(mLastMatch);
+            cancel();
         }
         mLastMatch = match;
         if (match != null) {
@@ -151,13 +151,15 @@
 
     private void start(Tuple match) {
         match.mAnimator.setTarget(getTarget());
-        mRunningAnimator = match.mAnimator;
-        match.mAnimator.start();
+        mRunningAnimator = match.mAnimator.clone();
+        mRunningAnimator.start();
     }
 
-    private void cancel(Tuple lastMatch) {
-        lastMatch.mAnimator.cancel();
-        lastMatch.mAnimator.setTarget(null);
+    private void cancel() {
+        if (mRunningAnimator != null) {
+            mRunningAnimator.cancel();
+            mRunningAnimator = null;
+        }
     }
 
     /**