Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: ffcb5e2

* commit 'ffcb5e210ad82e0f2a33d6644bc6690552a1785f':
  AVD: Requires all animator has stopped before start again.
This commit is contained in:
ztenghui
2014-11-12 21:22:18 +00:00
committed by android-build-merger
parent 1c252a6f8b ffcb5e210a
commit d46cf7138a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
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();
} }