diff --git a/lib/java/com/google/android/material/loadingindicator/LoadingIndicator.java b/lib/java/com/google/android/material/loadingindicator/LoadingIndicator.java index 8d22669ca2c..45b9abb8851 100644 --- a/lib/java/com/google/android/material/loadingindicator/LoadingIndicator.java +++ b/lib/java/com/google/android/material/loadingindicator/LoadingIndicator.java @@ -109,8 +109,6 @@ public LoadingIndicator( int minHideDelayUncapped = a.getInt(R.styleable.LoadingIndicator_minHideDelay, -1); minHideDelay = min(minHideDelayUncapped, MAX_HIDE_DELAY); a.recycle(); - - setAnimatorDurationScaleProvider(new AnimatorDurationScaleProvider()); } /** diff --git a/lib/java/com/google/android/material/loadingindicator/LoadingIndicatorDrawable.java b/lib/java/com/google/android/material/loadingindicator/LoadingIndicatorDrawable.java index 7df4e91277a..9e22bf96ee0 100644 --- a/lib/java/com/google/android/material/loadingindicator/LoadingIndicatorDrawable.java +++ b/lib/java/com/google/android/material/loadingindicator/LoadingIndicatorDrawable.java @@ -36,7 +36,6 @@ /** This class draws the graphics for a loading indicator. */ public final class LoadingIndicatorDrawable extends Drawable implements Drawable.Callback { - AnimatorDurationScaleProvider animatorDurationScaleProvider; @NonNull private final Context context; @NonNull private final LoadingIndicatorSpec specs; @@ -44,6 +43,7 @@ public final class LoadingIndicatorDrawable extends Drawable implements Drawable @NonNull private LoadingIndicatorAnimatorDelegate animatorDelegate; @NonNull Paint paint; + @NonNull AnimatorDurationScaleProvider animatorDurationScaleProvider; @IntRange(from = 0, to = 255) int alpha; @@ -76,6 +76,7 @@ public static LoadingIndicatorDrawable create( animatorDurationScaleProvider = new AnimatorDurationScaleProvider(); this.paint = new Paint(); + this.animatorDurationScaleProvider = new AnimatorDurationScaleProvider(); animatorDelegate.registerDrawable(this); setAlpha(255); @@ -195,13 +196,9 @@ public void unscheduleDrawable(@NonNull Drawable who, @NonNull Runnable what) { // ******************* Utility functions ******************* private boolean isSystemAnimatorDisabled() { - if (animatorDurationScaleProvider != null) { - float systemAnimatorDurationScale = - animatorDurationScaleProvider.getSystemAnimatorDurationScale( - context.getContentResolver()); - return systemAnimatorDurationScale == 0; - } - return false; + float systemAnimatorDurationScale = + animatorDurationScaleProvider.getSystemAnimatorDurationScale(context.getContentResolver()); + return systemAnimatorDurationScale == 0; } // ******************* Setter and getter *******************