summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2015-04-22 00:43:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-22 00:43:08 +0000
commit059451e18504d6fbbedacaeefe0f2b62b355104d (patch)
treeb65da95fe9a5713f90147739187276bab1676aa4 /core
parentfb861b6c8d255fc31f3460e39681a4fee35f156b (diff)
parent23606598244c2a297d994895eaf631b240d33242 (diff)
downloadframeworks_base-059451e18504d6fbbedacaeefe0f2b62b355104d.zip
frameworks_base-059451e18504d6fbbedacaeefe0f2b62b355104d.tar.gz
frameworks_base-059451e18504d6fbbedacaeefe0f2b62b355104d.tar.bz2
am 23606598: DO NOT MERGE: Reset the Node status when clone.
* commit '23606598244c2a297d994895eaf631b240d33242': DO NOT MERGE: Reset the Node status when clone.
Diffstat (limited to 'core')
-rw-r--r--core/java/android/animation/AnimatorSet.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/animation/AnimatorSet.java b/core/java/android/animation/AnimatorSet.java
index 92762c3..5055b29 100644
--- a/core/java/android/animation/AnimatorSet.java
+++ b/core/java/android/animation/AnimatorSet.java
@@ -1082,7 +1082,8 @@ public final class AnimatorSet extends Animator {
public Node clone() {
try {
Node node = (Node) super.clone();
- node.animation = (Animator) animation.clone();
+ node.animation = animation.clone();
+ node.done = false;
return node;
} catch (CloneNotSupportedException e) {
throw new AssertionError();