[ProgressIndicator] Removed explicitly disabling animators.

PiperOrigin-RevId: 322170475

Author: pekingme

lib/java/com/google/android/material/progressindicator/AnimatorDurationScaleProvider.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.material.progressindicator;
+
+import android.content.ContentResolver;
+import android.os.Build.VERSION;
+import android.provider.Settings.Global;
+import android.provider.Settings.System;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+
+/**
+ * This is a utility class to get system animator duration scale from the system settings. It's used
+ * as instances so that some requirements for testing can be met by mocking.
+ */
+public class AnimatorDurationScaleProvider {
+
+  /** The emulated system animator duration scale setting for SDK_INT < 16. */
+  private static float defaultSystemAnimatorDurationScale = 1f;
+
+  /** Returns the animator duration scale from developer options setting. */
+  public float getSystemAnimatorDurationScale(@NonNull ContentResolver contentResolver) {
+    if (VERSION.SDK_INT >= 17) {
+      return Global.getFloat(contentResolver, Global.ANIMATOR_DURATION_SCALE, 1f);
+    }
+    if (VERSION.SDK_INT == 16) {
+      return System.getFloat(contentResolver, System.ANIMATOR_DURATION_SCALE, 1f);
+    }
+    return defaultSystemAnimatorDurationScale;
+  }
+
+  /**
+   * Sets the default system animator duration scale for SDK < 16.
+   *
+   * @param scale New system animator duration scale.
+   * @see android.provider.Settings.Global#ANIMATOR_DURATION_SCALE
+   * @see android.provider.Settings.System#ANIMATOR_DURATION_SCALE
+   */
+  @VisibleForTesting
+  public static void setDefaultSystemAnimatorDurationScale(float scale) {
+    defaultSystemAnimatorDurationScale = scale;
+  }
+}

lib/java/com/google/android/material/progressindicator/ProgressIndicator.java

@@ -27,10 +27,7 @@
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
-import android.os.Build.VERSION;
 import android.os.SystemClock;
-import android.provider.Settings.Global;
-import android.provider.Settings.System;
 import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
@@ -124,11 +121,11 @@ public class ProgressIndicator extends ProgressBar {
 
   private long lastShowStartTime = -1L;
 
-  private boolean animatorDisabled = false;
-
   /** The scale of the animation speed combining system setting and debug parameters. */
   private float systemAnimationScale = 1f;
 
+  private AnimatorDurationScaleProvider animatorDurationScaleProvider;
+
   // ******************** Interfaces **********************
 
   /** The type of the progress indicator. */
@@ -159,6 +156,7 @@ public ProgressIndicator(
   public ProgressIndicator(
       @NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
     super(wrap(context, attrs, defStyleAttr, DEF_STYLE_RES), attrs, defStyleAttr);
+    animatorDurationScaleProvider = new AnimatorDurationScaleProvider();
     isParentDoneInitializing = true;
     // Ensure we are using the correctly themed context rather than the context was passed in.
     context = getContext();
@@ -346,7 +344,9 @@ private void unregisterAnimationCallbacks() {
   }
 
   private void updateAnimationScale() {
-    systemAnimationScale = getSystemAnimatorDurationScale();
+    systemAnimationScale =
+        animatorDurationScaleProvider.getSystemAnimatorDurationScale(
+            getContext().getContentResolver());
     if (systemAnimationScale > 0) {
       if (getProgressDrawable() != null) {
         getProgressDrawable().invalidateAnimationScale(systemAnimationScale);
@@ -356,15 +356,6 @@ private void updateAnimationScale() {
 
   // ******************** Visibility control **********************
 
-  /**
-   * This method sets a flag to prevent using any animators. It should be called before being
-   * visible.
-   */
-  @VisibleForTesting
-  public void disableAnimatorsForTesting() {
-    animatorDisabled = true;
-  }
-
   /**
    * Sets the visibility to {@code VISIBLE}. If this changes the visibility it will invoke {@code
    * onVisibilityChanged} and handle the visibility with animation of the drawables.
@@ -653,23 +644,9 @@ private void updateColorsInDrawables() {
     getIndeterminateDrawable().getAnimatorDelegate().invalidateSpecValues();
   }
 
-  /** Returns the animator duration scale from developer options setting. */
-  private float getSystemAnimatorDurationScale() {
-    if (VERSION.SDK_INT >= 17) {
-      return Global.getFloat(getContext().getContentResolver(), Global.ANIMATOR_DURATION_SCALE, 1f);
-    }
-    if (VERSION.SDK_INT == 16) {
-      return System.getFloat(getContext().getContentResolver(), System.ANIMATOR_DURATION_SCALE, 1f);
-    }
-    return 1f;
-  }
-
-  /**
-   * Returns whether the animators are disabled passively (by system settings) or actively (for
-   * testings).
-   */
+  /** Returns whether the animators are disabled passively (by system settings). */
   private boolean isAnimatorDisabled() {
-    return animatorDisabled || systemAnimationScale == 0;
+    return systemAnimationScale == 0;
   }
 
   // ******************** Getters and setters **********************
@@ -1037,6 +1014,12 @@ && getProgress() != progress
     super.setProgress(progress);
   }
 
+  @VisibleForTesting
+  public void setAnimatorDurationScaleProvider(
+      @NonNull AnimatorDurationScaleProvider animatorDurationScaleProvider) {
+    this.animatorDurationScaleProvider = animatorDurationScaleProvider;
+  }
+
   // ************************ In-place defined parameters ****************************
 
   /**