Merge "Fix AnimatorSet duration issue" (793807ff) · Commits · e / os / android_frameworks_base

core/java/android/animation/AnimatorSet.java

+9 −5

Original line number	Diff line number	Diff line
		@@ -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();