[Autofill Assistant] Use ValueAnimator instead of ObjectAnimator.

This CL replaces ObjectAnimators by ValueAnimators for the progress bar
animations, allowing us to remove the properties introduced in
http://crrev/c/1312477.

Change-Id: I45565b4aa863880e8a16522b9160dc2c8d0c4559
Reviewed-on: https://chromium-review.googlesource.com/c/1314630Reviewed-by: Stephane Zermatten <szermatt@chromium.org>
Commit-Queue: Jordan Demeulenaere <jdemeulenaere@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605290}

chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AnimatedProgressBar.java

@@ -7,9 +7,7 @@ package org.chromium.chrome.browser.autofill_assistant;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ArgbEvaluator;
-import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
-import android.util.Property;
 import android.view.View;
 
 import org.chromium.chrome.browser.compositor.layouts.ChromeAnimation;
@@ -23,37 +21,6 @@ import java.util.Queue;
  * pulsing.
  */
 public class AnimatedProgressBar {
-    // TODO(806868): Move these properties into MaterialProgressBar.java.
-    private static final Property<MaterialProgressBar, Integer> PROGRESS_PROPERTY =
-            new Property<MaterialProgressBar, Integer>(Integer.class, "progress") {
-                @Override
-                public Integer get(MaterialProgressBar progressBar) {
-                    // TODO(806868): Implement get once this property is moved into
-                    // MaterialProgressBar.java.
-                    throw new UnsupportedOperationException();
-                }
-
-                @Override
-                public void set(MaterialProgressBar progressBar, Integer progress) {
-                    progressBar.setProgress(progress);
-                }
-            };
-
-    private static final Property<MaterialProgressBar, Integer> COLOR_PROPERTY =
-            new Property<MaterialProgressBar, Integer>(Integer.class, "progressColor") {
-                @Override
-                public Integer get(MaterialProgressBar progressBar) {
-                    // TODO(806868): Implement get once this property is moved into
-                    // MaterialProgressBar.java.
-                    throw new UnsupportedOperationException();
-                }
-
-                @Override
-                public void set(MaterialProgressBar progressBar, Integer progressColor) {
-                    progressBar.setProgressColor(progressColor);
-                }
-            };
-
     // The number of ms the progress bar would take to go from 0 to 100%.
     private static final int PROGRESS_BAR_SPEED_MS = 3_000;
     private static final int PROGRESS_BAR_PULSING_DURATION_MS = 1_000;
@@ -64,8 +31,8 @@ public class AnimatedProgressBar {
 
     private boolean mIsRunningProgressAnimation = false;
     private int mLastProgress = 0;
-    private Queue<ObjectAnimator> mPendingIncreaseAnimations = new ArrayDeque<>();
-    private ObjectAnimator mPulseAnimation = null;
+    private Queue<ValueAnimator> mPendingIncreaseAnimations = new ArrayDeque<>();
+    private ValueAnimator mPulseAnimation = null;
 
     public AnimatedProgressBar(MaterialProgressBar progressBar, int normalColor, int pulsedColor) {
         mProgressBar = progressBar;
@@ -87,8 +54,7 @@ public class AnimatedProgressBar {
      */
     public void maybeIncreaseProgress(int progress) {
         if (progress > mLastProgress) {
-            ObjectAnimator progressAnimation =
-                    ObjectAnimator.ofInt(mProgressBar, PROGRESS_PROPERTY, mLastProgress, progress);
+            ValueAnimator progressAnimation = ValueAnimator.ofInt(mLastProgress, progress);
             progressAnimation.setDuration(PROGRESS_BAR_SPEED_MS * (progress - mLastProgress) / 100);
             progressAnimation.setInterpolator(ChromeAnimation.getAccelerateInterpolator());
             progressAnimation.addListener(new AnimatorListenerAdapter() {
@@ -102,6 +68,8 @@ public class AnimatedProgressBar {
                     }
                 }
             });
+            progressAnimation.addUpdateListener(
+                    animation -> mProgressBar.setProgress((int) animation.getAnimatedValue()));
             mLastProgress = progress;
 
             if (mIsRunningProgressAnimation) {
@@ -115,8 +83,7 @@ public class AnimatedProgressBar {
 
     public void enablePulsing() {
         if (mPulseAnimation == null) {
-            mPulseAnimation =
-                    ObjectAnimator.ofInt(mProgressBar, COLOR_PROPERTY, mNormalColor, mPulsedColor);
+            mPulseAnimation = ValueAnimator.ofInt(mNormalColor, mPulsedColor);
             mPulseAnimation.setDuration(PROGRESS_BAR_PULSING_DURATION_MS);
             mPulseAnimation.setEvaluator(new ArgbEvaluator());
             mPulseAnimation.setRepeatCount(ValueAnimator.INFINITE);
@@ -128,6 +95,8 @@ public class AnimatedProgressBar {
                     mProgressBar.setProgressColor(mNormalColor);
                 }
             });
+            mPulseAnimation.addUpdateListener(
+                    animation -> mProgressBar.setProgressColor((int) animation.getAnimatedValue()));
             mPulseAnimation.start();
         }
     }