[ProgressIndicator] Added the limit to not have stop indicator size b…

…igger than track thickness. PiperOrigin-RevId: 599948126
material-components · Jan 22, 2024 · ae11eb4 · ae11eb4
1 parent 97f18a3
commit ae11eb4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/java/com/google/android/material/progressindicator/LinearProgressIndicator.java b/lib/java/com/google/android/material/progressindicator/LinearProgressIndicator.java
@@ -18,6 +18,8 @@
 
 import com.google.android.material.R;
 
+import static java.lang.Math.min;
+
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
@@ -179,7 +181,7 @@ public int getTrackStopIndicatorSize() {
    */
   public void setTrackStopIndicatorSize(@Px int trackStopIndicatorSize) {
     if (spec.trackStopIndicatorSize != trackStopIndicatorSize) {
-      spec.trackStopIndicatorSize = trackStopIndicatorSize;
+      spec.trackStopIndicatorSize = min(trackStopIndicatorSize, spec.trackThickness);
       spec.validateSpec();
       if (getIndeterminateDrawable() != null) {
         getIndeterminateDrawable().setInitialTrackStopIndicatorSize(trackStopIndicatorSize);

diff --git a/lib/java/com/google/android/material/progressindicator/LinearProgressIndicatorSpec.java b/lib/java/com/google/android/material/progressindicator/LinearProgressIndicatorSpec.java
@@ -18,6 +18,8 @@
 
 import com.google.android.material.R;
 
+import static java.lang.Math.min;
+
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
@@ -91,7 +93,9 @@ public LinearProgressIndicatorSpec(
             R.styleable.LinearProgressIndicator_indicatorDirectionLinear,
             LinearProgressIndicator.INDICATOR_DIRECTION_LEFT_TO_RIGHT);
     trackStopIndicatorSize =
-        a.getDimensionPixelSize(R.styleable.LinearProgressIndicator_trackStopIndicatorSize, 0);
+        min(
+            a.getDimensionPixelSize(R.styleable.LinearProgressIndicator_trackStopIndicatorSize, 0),
+            trackThickness);
     a.recycle();
 
     validateSpec();