Merge "Fix AnimatorSet duration issue"

1 files changed, 9 insertions, 5 deletions

diff --git a/core/java/android/animation/AnimatorSet.java b/core/java/android/animation/AnimatorSet.java
index c5a4171..f9fa444 100644
--- a/core/java/android/animation/AnimatorSet.java
+++ b/core/java/android/animation/AnimatorSet.java
@@ -420,11 +420,7 @@ public final class AnimatorSet extends Animator {
         if (duration < 0) {
             throw new IllegalArgumentException("duration must be a value of zero or greater");
         }
-        for (Node node : mNodes) {
-            // TODO: don't set the duration of the timing-only nodes created by AnimatorSet to
-            // insert "play-after" delays
-            node.animation.setDuration(duration);
-        }
+        // Just record the value for now - it will be used later when the AnimatorSet starts
         mDuration = duration;
         return this;
     }
@@ -456,6 +452,14 @@ public final class AnimatorSet extends Animator {
         mTerminated = false;
         mStarted = true;
 
+        if (mDuration >= 0) {
+            // If the duration was set on this AnimatorSet, pass it along to all child animations
+            for (Node node : mNodes) {
+                // TODO: don't set the duration of the timing-only nodes created by AnimatorSet to
+                // insert "play-after" delays
+                node.animation.setDuration(mDuration);
+            }
+        }
         // First, sort the nodes (if necessary). This will ensure that sortedNodes
         // contains the animation nodes in the correct order.
         sortNodes();