diff options
| -rw-r--r-- | graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java index e786971fec82..1857345968fd 100644 --- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java @@ -19,7 +19,6 @@ import android.animation.AnimatorInflater; import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; import android.animation.Animator.AnimatorListener; -import android.animation.ValueAnimator; import android.annotation.NonNull; import android.annotation.Nullable; import android.content.res.ColorStateList; @@ -141,16 +140,6 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { /** Local, mutable animator set. */ private final AnimatorSet mAnimatorSet = new AnimatorSet(); - // Setup a value animator to get animation update callbacks. - private final ValueAnimator mUpdateAnim = ValueAnimator.ofFloat(0f, 1f); - private final ValueAnimator.AnimatorUpdateListener mUpdateListener = - new ValueAnimator.AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator animation) { - invalidateSelf(); - } - }; - /** * The resources against which this drawable was created. Used to attempt * to inflate animators if applyTheme() doesn't get called. @@ -616,32 +605,6 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { if (!mHasAnimatorSet) { mAnimatedVectorState.prepareLocalAnimators(mAnimatorSet, mRes); mHasAnimatorSet = true; - // Setup an infinitely running ValueAnimator, start it when AnimatorSet starts and - // end it when AnimatorSet ends, so we get the animation update timing for - // invalidating the drawable. Ideally, we would set an update listener on AnimatorSet, - // but since AnimatorSet doesn't support that yet, this is the alternative to achieve - // the same goal. - mUpdateAnim.setRepeatCount(ValueAnimator.INFINITE); - mUpdateAnim.addUpdateListener(mUpdateListener); - mAnimatorSet.addListener(new AnimatorListener() { - @Override - public void onAnimationStart(Animator animation) { - mUpdateAnim.start(); - } - - @Override - public void onAnimationEnd(Animator animation) { - mUpdateAnim.end(); - } - - @Override - public void onAnimationCancel(Animator animation) { - } - - @Override - public void onAnimationRepeat(Animator animation) { - } - }); mRes = null; } } @@ -767,4 +730,4 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { mAnimationCallbacks.clear(); } -} +}
\ No newline at end of file |