Merge "AVD: Requires all animator has stopped before start again." into lmp-mr1-dev

This commit is contained in:
ztenghui
2014-11-12 20:47:43 +00:00
committed by Android (Google) Code Review

View File

@@ -435,13 +435,16 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable {
@Override @Override
public void start() { public void start() {
// If any one of the animator has not ended, do nothing.
if (isStarted()) {
return;
}
// Otherwise, kick off every animator.
final ArrayList<Animator> animators = mAnimatedVectorState.mAnimators; final ArrayList<Animator> animators = mAnimatedVectorState.mAnimators;
final int size = animators.size(); final int size = animators.size();
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
final Animator animator = animators.get(i); final Animator animator = animators.get(i);
if (!animator.isStarted()) { animator.start();
animator.start();
}
} }
invalidateSelf(); invalidateSelf();
} }