From 476b686d671ec0c5f12389238c45b290efd5d744 Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Tue, 19 Jan 2016 19:50:18 +0000
Subject: [PATCH] Revert "Get animation update timing for AVD"

This reverts commit fc8e3cb768b7dfd7c0ed0fb93dd9d735887e8d45.

Bug: 26616870
Change-Id: I2f018cb34f014f4ebb635e18cd940997507a4a4d
---
 .../drawable/AnimatedVectorDrawable.java      | 39 +------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
index e786971fec82d..1857345968fd7 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