[ProgressIndicator] Updated the setter of track thickness to not upda…

…te track corner radius. PiperOrigin-RevId: 601245058 (cherry picked from commit 9c21612)
material-components · Mar 21, 2024 · 540f5ee · 540f5ee
1 parent dcd4f96
commit 540f5ee
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lib/java/com/google/android/material/progressindicator/BaseProgressIndicator.java b/lib/java/com/google/android/material/progressindicator/BaseProgressIndicator.java
@@ -548,7 +548,6 @@ public int getTrackThickness() {
   public void setTrackThickness(@Px int trackThickness) {
     if (spec.trackThickness != trackThickness) {
       spec.trackThickness = trackThickness;
-      spec.trackCornerRadius = min(spec.trackCornerRadius, spec.trackThickness / 2);
       requestLayout();
     }
   }

diff --git a/lib/java/com/google/android/material/progressindicator/CircularDrawingDelegate.java b/lib/java/com/google/android/material/progressindicator/CircularDrawingDelegate.java
@@ -109,7 +109,8 @@ void adjustCanvas(
     // These are used when drawing the indicator and track.
     useStrokeCap = spec.trackThickness / 2 <= spec.trackCornerRadius;
     displayedTrackThickness = spec.trackThickness * trackThicknessFraction;
-    displayedCornerRadius = spec.trackCornerRadius * trackThicknessFraction;
+    displayedCornerRadius =
+        min(spec.trackThickness / 2, spec.trackCornerRadius) * trackThicknessFraction;
     adjustedRadius = (spec.indicatorSize - spec.trackThickness) / 2f;
     if ((isShowing && spec.showAnimationBehavior == CircularProgressIndicator.SHOW_INWARD)
         || (isHiding && spec.hideAnimationBehavior == CircularProgressIndicator.HIDE_OUTWARD)) {

diff --git a/lib/java/com/google/android/material/progressindicator/LinearDrawingDelegate.java b/lib/java/com/google/android/material/progressindicator/LinearDrawingDelegate.java
@@ -113,7 +113,8 @@ void adjustCanvas(
 
     // These are set for the drawing the indicator and track.
     displayedTrackThickness = spec.trackThickness * trackThicknessFraction;
-    displayedCornerRadius = spec.trackCornerRadius * trackThicknessFraction;
+    displayedCornerRadius =
+        min(spec.trackThickness / 2, spec.trackCornerRadius) * trackThicknessFraction;
 
     // Clips all drawing to the track area, so it doesn't draw outside of its bounds (which can
     // happen in certain configurations of clipToPadding and clipChildren)