[ProgressIndicator] Internal revert.

PiperOrigin-RevId: 620344595

Author: pekingme

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

@@ -722,26 +722,6 @@ public void setWavelength(@Px int wavelength) {
     }
   }
 
-  /**
-   * Returns the speed of the indicator's waveform in pixels.
-   *
-   * @see #setSpeed(int)
-   */
-  @Px
-  public int getSpeed() {
-    return spec.speed;
-  }
-
-  /**
-   * Sets the speed of the indicator's waveform in pixels.
-   *
-   * @param speed The new speed in pixels.
-   * @see #getSpeed()
-   */
-  public void setSpeed(@Px int speed) {
-    spec.speed = speed;
-  }
-
   /**
    * Returns the show animation behavior used in this progress indicator.
    *

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

@@ -79,9 +79,6 @@ public abstract class BaseProgressIndicatorSpec {
   /** The size of the amplitude, if a wave effect is configured. */
   @Px public int amplitude;
 
-  /** The speed of the waveform, if a wave effect is configured. */
-  @Px public int speed;
-
   /**
    * Instantiates BaseProgressIndicatorSpec.
    *
@@ -122,7 +119,6 @@ protected BaseProgressIndicatorSpec(
 
     wavelength = abs(a.getDimensionPixelSize(R.styleable.BaseProgressIndicator_wavelength, 0));
     amplitude = abs(a.getDimensionPixelSize(R.styleable.BaseProgressIndicator_amplitude, 0));
-    speed = a.getDimensionPixelSize(R.styleable.BaseProgressIndicator_speed, 0);
 
     loadIndicatorColors(context, a);
     loadTrackColor(context, a);

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

@@ -18,7 +18,6 @@
 import static androidx.core.math.MathUtils.clamp;
 import static com.google.android.material.math.MathUtils.lerp;
 import static com.google.android.material.progressindicator.BaseProgressIndicator.HIDE_ESCAPE;
-import static java.lang.Math.PI;
 import static java.lang.Math.max;
 import static java.lang.Math.min;
 import static java.lang.Math.toDegrees;
@@ -173,7 +172,6 @@ void fillIndicator(
         color,
         activeIndicator.gapSize,
         activeIndicator.gapSize,
-        activeIndicator.phaseFraction,
         /* shouldDrawActiveIndicator= */ true);
   }
 
@@ -195,7 +193,6 @@ void fillTrack(
         color,
         gapSize,
         gapSize,
-        /* phaseFraction= */ 0f,
         /* shouldDrawActiveIndicator= */ false);
   }
 
@@ -210,7 +207,6 @@ void fillTrack(
    * @param paintColor The color used to draw the indicator.
    * @param startGapSize The gap size applied to the start (rotating behind) of the drawing part.
    * @param endGapSize The gap size applied to the end (rotating ahead) of the drawing part.
-   * @param phaseFraction The fraction [0, 1] of initial phase in one cycle.
    * @param shouldDrawActiveIndicator Whether this part should be drawn as an active indicator.
    */
   private void drawArc(
@@ -221,7 +217,6 @@ private void drawArc(
       @ColorInt int paintColor,
       @Px int startGapSize,
       @Px int endGapSize,
-      float phaseFraction,
       boolean shouldDrawActiveIndicator) {
     float arcFraction =
         endFraction >= startFraction
@@ -242,7 +237,6 @@ private void drawArc(
           paintColor,
           startGapSize,
           /* endGapSize= */ 0,
-          phaseFraction,
           shouldDrawActiveIndicator);
       drawArc(
           canvas,
@@ -252,7 +246,6 @@ private void drawArc(
           paintColor,
           /* startGapSize= */ 0,
           endGapSize,
-          phaseFraction,
           shouldDrawActiveIndicator);
       return;
     }
@@ -329,8 +322,7 @@ private void drawArc(
                 activePathMeasure,
                 displayedActivePath,
                 startDegreeWithoutCorners / 360,
-                arcDegreeWithoutCorners / 360,
-                phaseFraction);
+                arcDegreeWithoutCorners / 360);
         canvas.drawPath(displayedActivePath, paint);
       }
 
@@ -479,11 +471,7 @@ private void appendCubicPerHalfCycle(
 
   @NonNull
   private Pair<PathPoint, PathPoint> getDisplayedPath(
-      @NonNull PathMeasure pathMeasure,
-      @NonNull Path displayedPath,
-      float start,
-      float span,
-      float phaseFraction) {
+      @NonNull PathMeasure pathMeasure, @NonNull Path displayedPath, float start, float span) {
     if (adjustedRadius != cachedRadius
         || (pathMeasure == activePathMeasure && displayedAmplitude != cachedAmplitude)) {
       cachedAmplitude = displayedAmplitude;
@@ -493,12 +481,6 @@ private Pair<PathPoint, PathPoint> getDisplayedPath(
     displayedPath.rewind();
     span = clamp(span, 0, 1);
     float resultRotation = 0;
-    if (spec.hasWavyEffect()) {
-      float cycleCount = (float) (2 * PI * adjustedRadius / adjustedWavelength);
-      float phaseFractionInOneCycle = phaseFraction / cycleCount;
-      start += phaseFractionInOneCycle;
-      resultRotation -= phaseFractionInOneCycle * 360;
-    }
     start %= 1;
     float startDistance = start * pathMeasure.getLength() / 2;
     float endDistance = (start + span) * pathMeasure.getLength() / 2;

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

@@ -16,7 +16,6 @@
 
 package com.google.android.material.progressindicator;
 
-import android.animation.ValueAnimator;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint.Style;
@@ -40,8 +39,6 @@ public final class DeterminateDrawable<S extends BaseProgressIndicatorSpec>
   // If the progress is less than 1%, the gap will be proportional to the progress. So that, it
   // draws a full track at 0%.
   static final float GAP_RAMP_DOWN_THRESHOLD = 0.01f;
-  // The duration of repeated initial phase animation in ms. It can be any positive values.
-  private static final int PHASE_ANIMATION_DURATION_MS = 1000;
 
   // Drawing delegate object.
   private DrawingDelegate<S> drawingDelegate;
@@ -54,8 +51,6 @@ public final class DeterminateDrawable<S extends BaseProgressIndicatorSpec>
   // Whether to skip the spring animation on level change event.
   private boolean skipAnimationOnLevelChange = false;
 
-  @NonNull private final ValueAnimator phaseAnimator;
-
   DeterminateDrawable(
       @NonNull Context context,
       @NonNull BaseProgressIndicatorSpec baseSpec,
@@ -65,7 +60,6 @@ public final class DeterminateDrawable<S extends BaseProgressIndicatorSpec>
     setDrawingDelegate(drawingDelegate);
     activeIndicator = new ActiveIndicator();
 
-    // Initializes a spring animator for progress animation.
     springForce = new SpringForce();
 
     springForce.setDampingRatio(SpringForce.DAMPING_RATIO_NO_BOUNCY);
@@ -74,19 +68,6 @@ public final class DeterminateDrawable<S extends BaseProgressIndicatorSpec>
     springAnimation = new SpringAnimation(this, INDICATOR_LENGTH_IN_LEVEL);
     springAnimation.setSpring(springForce);
 
-    // Initializes a linear animator to enforce phase animation when progress is unchanged.
-    phaseAnimator = new ValueAnimator();
-    phaseAnimator.setDuration(PHASE_ANIMATION_DURATION_MS);
-    phaseAnimator.setFloatValues(0, 1);
-    phaseAnimator.setRepeatCount(ValueAnimator.INFINITE);
-    phaseAnimator.addUpdateListener(
-        animation -> {
-          if (baseSpec.speed != 0 && isVisible()) {
-            invalidateSelf();
-          }
-        });
-    phaseAnimator.start();
-
     setGrowFraction(1f);
   }
 
@@ -255,8 +236,6 @@ public void draw(@NonNull Canvas canvas) {
     drawingDelegate.validateSpecAndAdjustCanvas(
         canvas, getBounds(), getGrowFraction(), isShowing(), isHiding());
 
-    activeIndicator.phaseFraction = getPhaseFraction();
-
     paint.setStyle(Style.FILL);
     paint.setAntiAlias(true);
 

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

@@ -42,9 +42,6 @@
  */
 abstract class DrawableWithAnimatedVisibilityChange extends Drawable implements Animatable2Compat {
 
-  // Constant for mock values used in testing.
-  private static final float DEFAULT_MOCK_PHASE_FRACTION = -1f;
-
   // Argument restart used in Drawable setVisible() doesn't matter in implementation.
   private static final boolean DEFAULT_DRAWABLE_RESTART = false;
 
@@ -67,7 +64,6 @@ abstract class DrawableWithAnimatedVisibilityChange extends Drawable implements
   private boolean mockShowAnimationRunning;
   private boolean mockHideAnimationRunning;
   private float mockGrowFraction;
-  private float mockPhaseFraction = DEFAULT_MOCK_PHASE_FRACTION;
 
   // List of AnimationCallback to be called at the end of show/hide animation.
   private List<AnimationCallback> animationCallbacks;
@@ -443,29 +439,6 @@ void setMockHideAnimationRunning(
     mockGrowFraction = fraction;
   }
 
-  @VisibleForTesting
-  void setMockPhaseFraction(@FloatRange(from = 0.0, to = 1.0) float fraction) {
-    mockPhaseFraction = fraction;
-  }
-
-  float getPhaseFraction() {
-    if (mockPhaseFraction > 0) {
-      return mockPhaseFraction;
-    }
-    float phaseFraction = 0f;
-    if (baseSpec.speed != 0) {
-      float durationScale =
-          animatorDurationScaleProvider.getSystemAnimatorDurationScale(
-              context.getContentResolver());
-      int cycleInMs = (int) (1000f * baseSpec.wavelength / baseSpec.speed * durationScale);
-      phaseFraction = (float) (System.currentTimeMillis() % cycleInMs) / cycleInMs;
-      if (phaseFraction < 0f) {
-        phaseFraction = (phaseFraction % 1) + 1f;
-      }
-    }
-    return phaseFraction;
-  }
-
   // ******************* Properties *******************
 
   private static final Property<DrawableWithAnimatedVisibilityChange, Float> GROW_FRACTION =

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

@@ -168,10 +168,6 @@ protected static class ActiveIndicator {
     // active indicator. But for linear contiguous indeterminate mode, the indicators are connecting
     // to each other. Gaps are needed in this case.
     @Px int gapSize;
-
-    // The fraction [0, 1] of the initial phase [0, 2 * PI] on indicator.
-    @FloatRange(from = 0.0, to = 1.0)
-    float phaseFraction;
   }
 
   /** An entity class for a point on a path, with the support of fundamental operations. */

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

@@ -250,7 +250,6 @@ public void draw(@NonNull Canvas canvas) {
         indicatorIndex < animatorDelegate.activeIndicators.size();
         indicatorIndex++) {
       ActiveIndicator curIndicator = animatorDelegate.activeIndicators.get(indicatorIndex);
-      curIndicator.phaseFraction = getPhaseFraction();
       // Draws indicators.
       drawingDelegate.fillIndicator(canvas, paint, curIndicator, getAlpha());
 

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

@@ -158,7 +158,6 @@ void fillIndicator(
         color,
         activeIndicator.gapSize,
         activeIndicator.gapSize,
-        activeIndicator.phaseFraction,
         /* drawingActiveIndicator= */ true);
   }
 
@@ -180,7 +179,6 @@ void fillTrack(
         color,
         gapSize,
         gapSize,
-        /* phaseFraction= */ 0f,
         /* drawingActiveIndicator= */ false);
   }
 
@@ -194,7 +192,6 @@ void fillTrack(
    * @param paintColor The color used to draw the indicator.
    * @param startGapSize The gap size applied to the start (left) of the drawing part.
    * @param endGapSize The gap size applied to the end (right) of the drawing part.
-   * @param phaseFraction The fraction [0, 1] of initial phase in one cycle.
    * @param drawingActiveIndicator Whether this part should be drawn as an active indicator.
    */
   private void drawLine(
@@ -205,7 +202,6 @@ private void drawLine(
       @ColorInt int paintColor,
       @Px int startGapSize,
       @Px int endGapSize,
-      float phaseFraction,
       boolean drawingActiveIndicator) {
     startFraction = clamp(startFraction, 0f, 1f);
     endFraction = clamp(endFraction, 0f, 1f);
@@ -274,8 +270,7 @@ private void drawLine(
                   activePathMeasure,
                   displayedActivePath,
                   startBlockCenterX / trackLength,
-                  endBlockCenterX / trackLength,
-                  phaseFraction);
+                  endBlockCenterX / trackLength);
           canvas.drawPath(displayedActivePath, paint);
         }
         if (!useStrokeCap && displayedCornerRadius > 0) {
@@ -359,7 +354,7 @@ void invalidateCachedPaths() {
       int cycleCount = (int) (trackLength / spec.wavelength);
       adjustedWavelength = trackLength / cycleCount;
       float smoothness = SINE_WAVE_FORM_SMOOTHNESS;
-      for (int i = 0; i <= cycleCount; i++) {
+      for (int i = 0; i < cycleCount; i++) {
         cachedActivePath.cubicTo(2 * i + smoothness, 0, 2 * i + 1 - smoothness, 1, 2 * i + 1, 1);
         cachedActivePath.cubicTo(
             2 * i + 1 + smoothness, 1, 2 * i + 2 - smoothness, 0, 2 * i + 2, 0);
@@ -378,21 +373,9 @@ void invalidateCachedPaths() {
 
   @NonNull
   private Pair<PathPoint, PathPoint> getDisplayedPath(
-      @NonNull PathMeasure pathMeasure,
-      @NonNull Path displayedPath,
-      float start,
-      float end,
-      float phaseFraction) {
+      @NonNull PathMeasure pathMeasure, @NonNull Path displayedPath, float start, float end) {
     displayedPath.rewind();
     float resultTranslationX = -trackLength / 2;
-    if (spec.hasWavyEffect()) {
-      float cycleCount = trackLength / adjustedWavelength;
-      float phaseFractionInPath = phaseFraction / cycleCount;
-      float ratio = cycleCount / (cycleCount + 1);
-      start = (start + phaseFractionInPath) * ratio;
-      end = (end + phaseFractionInPath) * ratio;
-      resultTranslationX -= phaseFraction * adjustedWavelength;
-    }
     float startDistance = start * pathMeasure.getLength();
     float endDistance = end * pathMeasure.getLength();
     pathMeasure.getSegment(startDistance, endDistance, displayedPath, true);

lib/java/com/google/android/material/progressindicator/res/values/attrs.xml

@@ -97,11 +97,6 @@
       Defines the amplitude (in dp) of the wave effect.
     -->
     <attr name="amplitude" format="dimension"/>
-    <!--
-      Defines the wave speed (in dp/s) of the wavy effect. If positive, wave moves towards 100%; if
-      negative, wave moves towards 0%.
-    -->
-    <attr name="speed" format="dimension"/>
   </declare-styleable>
 
   <declare-styleable name="LinearProgressIndicator">