[ProgressIndicator] Renamed some attributes.

PiperOrigin-RevId: 343299956
(cherry picked from commit 9d7ae04)

Author: pekingme

catalog/java/io/material/catalog/progressindicator/ProgressIndicatorStandaloneDemoFragment.java

@@ -51,8 +51,8 @@ public View onCreateDemoView(
     CircularProgressIndicatorSpec spec =
         new CircularProgressIndicatorSpec(getContext(), /*attrs=*/ null);
     spec.indicatorInset = 0; // No inset.
-    spec.indicatorRadius = (int) ViewUtils.dpToPx(getContext(), 10); // Circular radius is 10 dp.
-    IndeterminateDrawable progressIndicatorDrawable =
+    spec.indicatorSize = (int) ViewUtils.dpToPx(getContext(), 22); // Circular radius is 10 dp.
+    IndeterminateDrawable<CircularProgressIndicatorSpec> progressIndicatorDrawable =
         IndeterminateDrawable.createCircularDrawable(getContext(), spec);
 
     Chip chip = view.findViewById(R.id.cat_progress_indicator_chip);

catalog/java/io/material/catalog/progressindicator/res/layout/cat_progress_indicator_determinate_fragment.xml

@@ -40,7 +40,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       app:indicatorDirectionLinear="endToStart"
-      app:indicatorCornerRadius="@dimen/mtrl_progress_indicator_full_rounded_corner_radius"/>
+      app:trackCornerRadius="@dimen/mtrl_progress_indicator_full_rounded_corner_radius"/>
 
   <TextView
       android:layout_width="wrap_content"
@@ -103,7 +103,7 @@
           android:layout_gravity="center"
           style="@style/Widget.MaterialComponents.CircularProgressIndicator"
           app:indicatorDirectionCircular="counterclockwise"
-          app:indicatorCornerRadius="@dimen/mtrl_progress_indicator_full_rounded_corner_radius"/>
+          app:trackCornerRadius="@dimen/mtrl_progress_indicator_full_rounded_corner_radius"/>
     </LinearLayout>
 
     <LinearLayout

catalog/java/io/material/catalog/progressindicator/res/layout/cat_progress_indicator_indeterminate_indicators.xml

@@ -37,7 +37,7 @@
       android:layout_height="wrap_content"
       android:indeterminate="true"
       app:indicatorDirectionLinear="endToStart"
-      app:indicatorCornerRadius="@dimen/mtrl_progress_indicator_full_rounded_corner_radius"/>
+      app:trackCornerRadius="@dimen/mtrl_progress_indicator_full_rounded_corner_radius"/>
 
   <TextView
       android:layout_width="wrap_content"
@@ -103,7 +103,7 @@
           android:indeterminate="true"
           style="@style/Widget.MaterialComponents.CircularProgressIndicator"
           app:indicatorDirectionCircular="counterclockwise"
-          app:indicatorCornerRadius="@dimen/mtrl_progress_indicator_full_rounded_corner_radius"/>
+          app:trackCornerRadius="@dimen/mtrl_progress_indicator_full_rounded_corner_radius"/>
     </LinearLayout>
 
     <LinearLayout

docs/components/ProgressIndicator.md

@@ -48,8 +48,8 @@ LinearProgressIndicator indicator = new LinearProgressIndicator(getContext());
 ### Default style
 
 The default style `Widget.MaterialComponents.LinearProgressIndicator` will
-configure the indicator to draw a linear strip with the track width of 4dp. The
-indicator will swipe or grow from `start` to `end` regarding the layout
+configure the indicator to draw a linear strip with the track thickness of 4dp.
+The indicator will swipe or grow from `start` to `end` regarding the layout
 direction. No animation will be used while showing or hiding.
 
 ### Custom styling
@@ -69,8 +69,8 @@ regardless the number of indicator colors used.
 
 #### Size and layout
 
-`LinearProgressIndicator` can configure its height by adjusting `indicatorSize`.
-`indicatorSize` sets the width of the track/indicator; in the linear type case,
+`LinearProgressIndicator` can configure its height by adjusting `trackThickness`.
+`trackThickness` sets the width of the track/indicator; in the linear type case,
 it's the height of the strip.
 
 Note: The width of strip depends on the view and its layout.
@@ -104,11 +104,11 @@ By setting the `showAnimationBehavior` and `hideAnimationBehavior`, the indicato
 have different animation effects as follows:
 
 <table>
-  <tr><td colspan=2>showAnimationBehavior<td></tr>
+  <tr><td colspan=2>showAnimationBehavior</td></tr>
   <tr><td>none</td><td>Appear immediately</td></tr>
   <tr><td>upward</td><td>Expanding from the bottom edge</td></tr>
   <tr><td>downward</td><td>Expanding from the top edge</td></tr>
-  <tr><td colspan=2>hideAnimationBehavior<td></tr>
+  <tr><td colspan=2>hideAnimationBehavior</td></tr>
   <tr><td>none</td><td>Disappear immediately</td></tr>
   <tr><td>upward</td><td>Collapsing to the top edge</td></tr>
   <tr><td>downward</td><td>Collapsing to the bottom edge</td></tr>
@@ -155,10 +155,10 @@ CircularProgressIndicator indicator = new CircularProgressIndicator(getContext()
 
 The default style `Widget.MaterialComponents.CircularProgressIndicator` will
 configure the indicator to draw a circular (or partial) ring with the track
-width of 4dp. The radius is 18dp measured from the axial line (or the circular
-between the inner and outer edges). There is also 4dp inset added on all sides.
-The indicator will spin or grow clockwise regardless the layout direction. No
-animation will be used while showing or hiding.
+thickness of 4dp. The indicator size is 40dp measured as the outer edge. There
+is also 4dp inset added on all sides. The indicator will spin or grow clockwise
+regardless the layout direction. No animation will be used while showing or
+hiding.
 
 ### Custom styling
 
@@ -171,13 +171,13 @@ Same as `LinearProgressIndicator`.
 
 #### Size and layout
 
-`CircularProgressIndicator` can configure its size by adjusting `indicatorSize`,
-`indicatorRadius`, and `indicatorInset`. `indicatorSize` sets the width of the
-track/indicator. `indicatorRadius` sets the size of the ring by the radius
-measured from the axial line. `indicatorInset` gives an extra space between the
-outer edge to the drawable's bounds.
+`CircularProgressIndicator` can configure its size by adjusting
+`trackThickness`, `indicatorSize`, and `indicatorInset`. `trackThickness` sets
+the thickness of the track/indicator. `indicatorSize` sets the size of the ring
+by the diameter of the outer edge. `indicatorInset` gives an extra space between
+the outer edge to the drawable's bounds.
 
-Note: If half of the `indicatorSize` is greater than the `indicatorRadius`,
+Note: If the `trackThickness` is greater than the half of the `indicatorSize`,
 `IllegalArgumentException` will be thrown during initialization.
 
 #### Showing and hiding with animations
@@ -209,11 +209,11 @@ By setting the `showAnimationBehavior` and `hideAnimationBehavior`, the indicato
 can have different animation effects as follows:
 
 <table>
-  <tr><td colspan=2>showAnimationBehavior<td></tr>
+  <tr><td colspan=2>showAnimationBehavior</td></tr>
   <tr><td>none</td><td>Appear immediately</td></tr>
   <tr><td>inward</td><td>Expanding from the outer edge</td></tr>
   <tr><td>outward</td><td>Expanding from the inner edge</td></tr>
-  <tr><td colspan=2>hideAnimationBehavior<td></tr>
+  <tr><td colspan=2>hideAnimationBehavior</td></tr>
   <tr><td>none</td><td>Disappear immediately</td></tr>
   <tr><td>inward</td><td>Collapsing to the inner edge</td></tr>
   <tr><td>outward</td><td>Collapsing to the outer edge</td></tr>

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

@@ -52,16 +52,16 @@
  * is an abstract class which is not meant for directly use.
  *
  * <p>With the default style {@link R.style#Widget_MaterialComponents_ProgressIndicator}, 4dp
- * indicator/track size and no animation is used for visibility change. Without customization,
+ * indicator/track thickness and no animation is used for visibility change. Without customization,
  * primaryColor will be used as the indicator color; the indicator color applying disabledAlpha will
  * be used as the track color. The following attributes can be used to customize the progress
  * indicator's appearance:
  *
  * <ul>
- *   <li>{@code indicatorSize}: the stroke width of the indicator and track.
+ *   <li>{@code trackThickness}: the thickness of the indicator and track.
  *   <li>{@code indicatorColor}: the color of the indicator.
  *   <li>{@code trackColor}: the color of the track.
- *   <li>{@code indicatorCornerRadius}: the radius of the rounded corner of the indicator stroke.
+ *   <li>{@code trackCornerRadius}: the radius of the rounded corner of the indicator and track.
  *   <li>{@code showAnimationBehavior}: the animation direction to show the indicator and track.
  *   <li>{@code hideAnimationBehavior}: the animation direction to hide the indicator and track.
  * </ul>
@@ -524,28 +524,28 @@ public synchronized void setIndeterminate(boolean indeterminate) {
   }
 
   /**
-   * Returns the indicator size of this progress indicator in pixels.
+   * Returns the track thickness of this progress indicator in pixels.
    *
-   * @see #setIndicatorSize(int)
+   * @see #setTrackThickness(int)
    * @attr ref
-   *     com.google.android.material.progressindicator.R.stylable#BaseProgressIndicator_indicatorSize
+   *     com.google.android.material.progressindicator.R.stylable#BaseProgressIndicator_trackThickness
    */
   @Px
-  public int getIndicatorSize() {
-    return spec.indicatorSize;
+  public int getTrackThickness() {
+    return spec.trackThickness;
   }
 
   /**
-   * Sets the indicator size of this progress indicator.
+   * Sets the track thickness of this progress indicator.
    *
-   * @param indicatorSize The new indicator size in pixel.
-   * @see #getIndicatorSize()
+   * @param trackThickness The new indicator size in pixel.
+   * @see #getTrackThickness()
    * @attr ref
-   *     com.google.android.material.progressindicator.R.stylable#BaseProgressIndicator_indicatorSize
+   *     com.google.android.material.progressindicator.R.stylable#BaseProgressIndicator_trackThickness
    */
-  public void setIndicatorSize(@Px int indicatorSize) {
-    if (spec.indicatorSize != indicatorSize) {
-      spec.indicatorSize = indicatorSize;
+  public void setTrackThickness(@Px int trackThickness) {
+    if (spec.trackThickness != trackThickness) {
+      spec.trackThickness = trackThickness;
       requestLayout();
     }
   }
@@ -610,28 +610,28 @@ public void setTrackColor(@ColorInt int trackColor) {
   }
 
   /**
-   * Returns the corner radius for progress indicator with rounded corners in pixels.
+   * Returns the radius of the rounded corner for the indicator and track in pixels.
    *
-   * @see #setIndicatorCornerRadius(int)
+   * @see #setTrackCornerRadius(int)
    * @attr ref
-   *     com.google.android.material.progressindicator.R.stylable#BaseProgressIndicator_indicatorCornerRadius
+   *     com.google.android.material.progressindicator.R.stylable#BaseProgressIndicator_trackCornerRadius
    */
   @Px
-  public int getIndicatorCornerRadius() {
-    return spec.indicatorCornerRadius;
+  public int getTrackCornerRadius() {
+    return spec.trackCornerRadius;
   }
 
   /**
-   * Sets the corner radius for progress indicator with rounded corners in pixels.
+   * Sets the radius of the rounded corner for the indicator and track in pixels.
    *
-   * @param indicatorCornerRadius The new corner radius in pixels.
-   * @see #getIndicatorCornerRadius()
+   * @param trackCornerRadius The new corner radius in pixels.
+   * @see #getTrackCornerRadius()
    * @attr ref
-   *     com.google.android.material.progressindicator.R.stylable#BaseProgressIndicator_indicatorCornerRadius
+   *     com.google.android.material.progressindicator.R.stylable#BaseProgressIndicator_trackCornerRadius
    */
-  public void setIndicatorCornerRadius(@Px int indicatorCornerRadius) {
-    if (spec.indicatorCornerRadius != indicatorCornerRadius) {
-      spec.indicatorCornerRadius = min(indicatorCornerRadius, spec.indicatorSize / 2);
+  public void setTrackCornerRadius(@Px int trackCornerRadius) {
+    if (spec.trackCornerRadius != trackCornerRadius) {
+      spec.trackCornerRadius = min(trackCornerRadius, spec.trackThickness / 2);
     }
   }
 

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

@@ -40,15 +40,15 @@
  * reflect the attributes defined in {@link R.styleable#BaseProgressIndicator}.
  */
 public abstract class BaseProgressIndicatorSpec {
-  /** The size of the progress track and indicator. */
-  @Px public int indicatorSize;
+  /** The thickness of the progress track and indicator. */
+  @Px public int trackThickness;
 
   /**
    * When this is greater than 0, the corners of both the track and the indicator will be rounded
    * with this radius. If the radius is greater than half of the track width, an {@code
    * IllegalArgumentException} will be thrown during initialization.
    */
-  @Px public int indicatorCornerRadius;
+  @Px public int trackCornerRadius;
 
   /**
    * The color array of the progress stroke. In determinate mode and single color indeterminate
@@ -85,22 +85,22 @@ protected BaseProgressIndicatorSpec(
   private void loadBaseSpecFromAttributes(
       @NonNull Context context, @Nullable AttributeSet attrs, @AttrRes final int defStyleAttr) {
     int defaultIndicatorSize =
-        context.getResources().getDimensionPixelSize(R.dimen.mtrl_progress_indicator_size);
+        context.getResources().getDimensionPixelSize(R.dimen.mtrl_progress_track_thickness);
     TypedArray a =
         ThemeEnforcement.obtainStyledAttributes(
             context,
             attrs,
             R.styleable.BaseProgressIndicator,
             defStyleAttr,
             BaseProgressIndicator.DEF_STYLE_RES);
-    indicatorSize =
+    trackThickness =
         getDimensionPixelSize(
-            context, a, R.styleable.BaseProgressIndicator_indicatorSize, defaultIndicatorSize);
-    indicatorCornerRadius =
+            context, a, R.styleable.BaseProgressIndicator_trackThickness, defaultIndicatorSize);
+    trackCornerRadius =
         min(
             getDimensionPixelSize(
-                context, a, R.styleable.BaseProgressIndicator_indicatorCornerRadius, 0),
-            indicatorSize / 2);
+                context, a, R.styleable.BaseProgressIndicator_trackCornerRadius, 0),
+            trackThickness / 2);
     showAnimationBehavior =
         a.getInt(
             R.styleable.BaseProgressIndicator_showAnimationBehavior,

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

@@ -31,7 +31,7 @@ final class CircularDrawingDelegate extends DrawingDelegate<CircularProgressIndi
   // This is a factor effecting the positive direction to draw the arc. +1 for clockwise; -1 for
   // counter-clockwise.
   private int arcDirectionFactor = 1;
-  private float displayedIndicatorSize;
+  private float displayedTrackThickness;
   private float displayedCornerRadius;
   private float adjustedRadius;
 
@@ -53,18 +53,17 @@ public int getPreferredHeight() {
   /**
    * Adjusts the canvas for drawing circular progress indicator. It rotates the canvas -90 degrees
    * to keep the 0 at the top. The canvas is clipped to a square with the size just includes the
-   * inset. It will also pre-calculate the bound for drawing the arc based on the indicate radius
-   * and current indicator size.
+   * inset. It will also pre-calculate the bound for drawing the arc based on the spinner radius and
+   * current track thickness.
    *
    * @param canvas Canvas to draw.
-   * @param indicatorSizeFraction A fraction representing how much portion of the indicator size
-   * should be used in the drawing.
+   * @param trackThicknessFraction A fraction representing how much portion of the track thickness
+   *     should be used in the drawing.
    */
   @Override
   public void adjustCanvas(
-      @NonNull Canvas canvas,
-      @FloatRange(from = 0.0, to = 1.0) float indicatorSizeFraction) {
-    int outerRadiusWithInset = spec.indicatorRadius + spec.indicatorSize / 2 + spec.indicatorInset;
+      @NonNull Canvas canvas, @FloatRange(from = 0.0, to = 1.0) float trackThicknessFraction) {
+    float outerRadiusWithInset = spec.indicatorSize / 2f + spec.indicatorInset;
     canvas.translate(outerRadiusWithInset, outerRadiusWithInset);
     // Rotates canvas so that arc starts at top.
     canvas.rotate(-90f);
@@ -77,23 +76,25 @@ public void adjustCanvas(
     // These are used when drawing the indicator and track.
     arcDirectionFactor =
         spec.indicatorDirection == CircularProgressIndicator.INDICATOR_DIRECTION_CLOCKWISE ? 1 : -1;
-    displayedIndicatorSize = spec.indicatorSize * indicatorSizeFraction;
-    displayedCornerRadius = spec.indicatorCornerRadius * indicatorSizeFraction;
-    adjustedRadius = spec.indicatorRadius;
+    displayedTrackThickness = spec.trackThickness * trackThicknessFraction;
+    displayedCornerRadius = spec.trackCornerRadius * trackThicknessFraction;
+    adjustedRadius = (spec.indicatorSize - spec.trackThickness) / 2f;
     if ((drawable.isShowing()
             && spec.showAnimationBehavior == CircularProgressIndicator.SHOW_INWARD)
         || (drawable.isHiding()
             && spec.hideAnimationBehavior == CircularProgressIndicator.HIDE_OUTWARD)) {
-      // Increases the radius by half of the full size, then reduces it half way of the displayed
-      // size to match the outer edges of the displayed indicator and the full indicator.
-      adjustedRadius += (1 - indicatorSizeFraction) * spec.indicatorSize / 2;
+      // Increases the radius by half of the full thickness, then reduces it half way of the
+      // displayed thickness to match the outer edges of the displayed indicator and the full
+      // indicator.
+      adjustedRadius += (1 - trackThicknessFraction) * spec.trackThickness / 2;
     } else if ((drawable.isShowing()
             && spec.showAnimationBehavior == CircularProgressIndicator.SHOW_OUTWARD)
         || (drawable.isHiding()
             && spec.hideAnimationBehavior == CircularProgressIndicator.HIDE_INWARD)) {
-      // Decreases the radius by half of the full size, then raises it half way of the displayed
-      // size to match the inner edges of the displayed indicator and the full indicator.
-      adjustedRadius -= (1 - indicatorSizeFraction) * spec.indicatorSize / 2;
+      // Decreases the radius by half of the full thickness, then raises it half way of the
+      // displayed thickness to match the inner edges of the displayed indicator and the full
+      // indicator.
+      adjustedRadius -= (1 - trackThicknessFraction) * spec.trackThickness / 2;
     }
   }
 
@@ -125,7 +126,7 @@ void fillIndicator(
     paint.setStrokeCap(Cap.BUTT);
     paint.setAntiAlias(true);
     paint.setColor(color);
-    paint.setStrokeWidth(displayedIndicatorSize);
+    paint.setStrokeWidth(displayedTrackThickness);
 
     // Calculates the start and end in degrees.
     float startDegree = startFraction * 360 * arcDirectionFactor;
@@ -150,15 +151,15 @@ void fillIndicator(
       drawRoundedEnd(
           canvas,
           paint,
-          displayedIndicatorSize,
+          displayedTrackThickness,
           displayedCornerRadius,
           startDegree,
           true,
           cornerPatternRectBound);
       drawRoundedEnd(
           canvas,
           paint,
-          displayedIndicatorSize,
+          displayedTrackThickness,
           displayedCornerRadius,
           startDegree + arcDegree,
           false,
@@ -181,14 +182,14 @@ void fillTrack(@NonNull Canvas canvas, @NonNull Paint paint) {
     paint.setStrokeCap(Cap.BUTT);
     paint.setAntiAlias(true);
     paint.setColor(trackColor);
-    paint.setStrokeWidth(displayedIndicatorSize);
+    paint.setStrokeWidth(displayedTrackThickness);
 
     RectF arcBound = new RectF(-adjustedRadius, -adjustedRadius, adjustedRadius, adjustedRadius);
     canvas.drawArc(arcBound, 0, 360, false, paint);
   }
 
   private int getSize() {
-    return spec.indicatorRadius * 2 + spec.indicatorSize + spec.indicatorInset * 2;
+    return spec.indicatorSize + spec.indicatorInset * 2;
   }
 
   private void drawRoundedEnd(