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

Merge "Fixing AVD animation with startOffset" into lmp-dev

Browse Source
This commit is contained in:
ztenghui
2014-08-22 20:23:23 +00:00
committed by Android (Google) Code Review
parent ef22000ea9 14aedd1fbf
commit a94900e587
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
View File

@@ -155,7 +155,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable {
@Override
public void draw(Canvas canvas) {
mAnimatedVectorState.mVectorDrawable.draw(canvas);
if (isRunning()) {
if (isStarted()) {
invalidateSelf();
}
}
@@ -361,13 +361,25 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable {
return false;
}
private boolean isStarted() {
final ArrayList<Animator> animators = mAnimatedVectorState.mAnimators;
final int size = animators.size();
for (int i = 0; i < size; i++) {
final Animator animator = animators.get(i);
if (animator.isStarted()) {
return true;
}
}
return false;
}
@Override
public void start() {
final ArrayList<Animator> animators = mAnimatedVectorState.mAnimators;
final int size = animators.size();
for (int i = 0; i < size; i++) {
final Animator animator = animators.get(i);
if (!animator.isRunning()) {
if (!animator.isStarted()) {
animator.start();
}
}