Skip to content

Commit 3074e52

Browse files
committed
[LoadingIndicator] Teach LoadingIndicatorDrawable to get the animator duration scale
1 parent 4b26950 commit 3074e52

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

lib/java/com/google/android/material/loadingindicator/LoadingIndicator.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,6 @@ public LoadingIndicator(
109109
int minHideDelayUncapped = a.getInt(R.styleable.LoadingIndicator_minHideDelay, -1);
110110
minHideDelay = min(minHideDelayUncapped, MAX_HIDE_DELAY);
111111
a.recycle();
112-
113-
setAnimatorDurationScaleProvider(new AnimatorDurationScaleProvider());
114112
}
115113

116114
/**

lib/java/com/google/android/material/loadingindicator/LoadingIndicatorDrawable.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
/** This class draws the graphics for a loading indicator. */
3838
public final class LoadingIndicatorDrawable extends Drawable implements Drawable.Callback {
39-
AnimatorDurationScaleProvider animatorDurationScaleProvider;
39+
@NonNull AnimatorDurationScaleProvider animatorDurationScaleProvider;
4040

4141
@NonNull private final Context context;
4242
@NonNull private final LoadingIndicatorSpec specs;
@@ -73,7 +73,7 @@ public static LoadingIndicatorDrawable create(
7373
this.specs = specs;
7474
this.drawingDelegate = drawingDelegate;
7575
this.animatorDelegate = animatorDelegate;
76-
animatorDurationScaleProvider = new AnimatorDurationScaleProvider();
76+
this.animatorDurationScaleProvider = new AnimatorDurationScaleProvider();
7777

7878
this.paint = new Paint();
7979

@@ -195,13 +195,9 @@ public void unscheduleDrawable(@NonNull Drawable who, @NonNull Runnable what) {
195195
// ******************* Utility functions *******************
196196

197197
private boolean isSystemAnimatorDisabled() {
198-
if (animatorDurationScaleProvider != null) {
199-
float systemAnimatorDurationScale =
200-
animatorDurationScaleProvider.getSystemAnimatorDurationScale(
201-
context.getContentResolver());
202-
return systemAnimatorDurationScale == 0;
203-
}
204-
return false;
198+
float systemAnimatorDurationScale =
199+
animatorDurationScaleProvider.getSystemAnimatorDurationScale(context.getContentResolver());
200+
return systemAnimatorDurationScale == 0;
205201
}
206202

207203
// ******************* Setter and getter *******************

0 commit comments

Comments
 (0)