[LinearProgressIndicator] Fix stop indicator size when changing track thickness

Resolves #4669

  - 249bbb3 by pubiqq <[email protected]>

PiperOrigin-RevId: 769738304

Author: pubiqq

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

@@ -373,7 +373,8 @@ void drawStopIndicator(
       @IntRange(from = 0, to = 255) int drawableAlpha) {
     int paintColor = MaterialColors.compositeARGBWithAlpha(color, drawableAlpha);
     drawingDeterminateIndicator = false;
-    if (spec.trackStopIndicatorSize > 0 && paintColor != Color.TRANSPARENT) {
+    int trackStopIndicatorSize = spec.getActualTrackStopIndicatorSize();
+    if (trackStopIndicatorSize > 0 && paintColor != Color.TRANSPARENT) {
       // Draws the stop indicator at the end of the track if needed.
       paint.setStyle(Style.FILL);
       paint.setColor(paintColor);
@@ -386,9 +387,9 @@ void drawStopIndicator(
           paint,
           new PathPoint(
               new float[] {trackLength / 2 - stopIndicatorCenterX, 0}, new float[] {1, 0}),
-          spec.trackStopIndicatorSize,
-          spec.trackStopIndicatorSize,
-          displayedCornerRadius * spec.trackStopIndicatorSize / displayedTrackThickness);
+          trackStopIndicatorSize,
+          trackStopIndicatorSize,
+          displayedCornerRadius * trackStopIndicatorSize / displayedTrackThickness);
     }
   }
 

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

@@ -58,8 +58,7 @@
  * developer guidance</a> and <a
  * href="https://material.io/components/progress-indicators/overview">design guidelines</a>.
  */
-public class LinearProgressIndicator
-    extends BaseProgressIndicator<LinearProgressIndicatorSpec> {
+public class LinearProgressIndicator extends BaseProgressIndicator<LinearProgressIndicatorSpec> {
   public static final int DEF_STYLE_RES = R.style.Widget_MaterialComponents_LinearProgressIndicator;
 
   /**
@@ -122,11 +121,11 @@ protected void onSizeChanged(int w, int h, int oldw, int oldh) {
     int contentHeight = h - (getPaddingTop() + getPaddingBottom());
     Drawable drawable = getIndeterminateDrawable();
     if (drawable != null) {
-      drawable.setBounds(/*left=*/ 0, /*top=*/ 0, contentWidth, contentHeight);
+      drawable.setBounds(/* left= */ 0, /* top= */ 0, contentWidth, contentHeight);
     }
     drawable = getProgressDrawable();
     if (drawable != null) {
-      drawable.setBounds(/*left=*/ 0, /*top=*/ 0, contentWidth, contentHeight);
+      drawable.setBounds(/* left= */ 0, /* top= */ 0, contentWidth, contentHeight);
     }
   }
 
@@ -244,7 +243,7 @@ public int getTrackStopIndicatorSize() {
    */
   public void setTrackStopIndicatorSize(@Px int trackStopIndicatorSize) {
     if (spec.trackStopIndicatorSize != trackStopIndicatorSize) {
-      spec.trackStopIndicatorSize = min(trackStopIndicatorSize, spec.trackThickness);
+      spec.trackStopIndicatorSize = trackStopIndicatorSize;
       spec.validateSpec();
       invalidate();
     }

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

@@ -48,7 +48,7 @@ public final class LinearProgressIndicatorSpec extends BaseProgressIndicatorSpec
 
   boolean drawHorizontallyInverse;
 
-  /** The size of the stop indicator at the end of the track. */
+  /** The desired size of the stop indicator at the end of the track. */
   @Px public int trackStopIndicatorSize;
 
   /** The padding of the stop indicator at the end of the track. */
@@ -102,9 +102,7 @@ public LinearProgressIndicatorSpec(
             R.styleable.LinearProgressIndicator_indicatorDirectionLinear,
             LinearProgressIndicator.INDICATOR_DIRECTION_LEFT_TO_RIGHT);
     trackStopIndicatorSize =
-        min(
-            a.getDimensionPixelSize(R.styleable.LinearProgressIndicator_trackStopIndicatorSize, 0),
-            trackThickness);
+        a.getDimensionPixelSize(R.styleable.LinearProgressIndicator_trackStopIndicatorSize, 0);
     if (a.hasValue(R.styleable.LinearProgressIndicator_trackStopIndicatorPadding)) {
       trackStopIndicatorPadding =
           a.getDimensionPixelSize(R.styleable.LinearProgressIndicator_trackStopIndicatorPadding, 0);
@@ -143,6 +141,11 @@ public int getTrackInnerCornerRadiusInPx() {
             : trackInnerCornerRadius;
   }
 
+  @Px
+  int getActualTrackStopIndicatorSize() {
+    return min(trackStopIndicatorSize, trackThickness);
+  }
+
   @Override
   public boolean useStrokeCap() {
     return super.useStrokeCap() && getTrackInnerCornerRadiusInPx() == getTrackCornerRadiusInPx();