[NTC][ProgressIndicator] Update styles

Update the Material ProgressIndicator to be compliant with the latest accessibility requirements. PiperOrigin-RevId: 591927327
material-components · Dec 19, 2023 · 15b533f · 15b533f
1 parent c695802
commit 15b533f
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 9 deletions.
diff --git a/lib/java/com/google/android/material/progressindicator/LinearDrawingDelegate.java b/lib/java/com/google/android/material/progressindicator/LinearDrawingDelegate.java
@@ -176,12 +176,14 @@ private void drawStopIndicator(@NonNull Canvas canvas, @NonNull Paint paint) {
         MaterialColors.compositeARGBWithAlpha(spec.indicatorColors[0], drawable.getAlpha());
     paint.setColor(indicatorColor);
     Rect trackBounds = canvas.getClipBounds();
+    // Maintain proper ratio when stop is smaller than track height and offset from edges.
+    float offset = max(0, displayedTrackThickness - spec.trackStopIndicatorSize);
     RectF stopBounds =
         new RectF(
-            trackBounds.right - spec.trackStopIndicatorSize,
-            -displayedTrackThickness / 2,
-            trackBounds.right,
-            displayedTrackThickness / 2);
+            trackBounds.right - displayedTrackThickness + offset / 2,
+            -(displayedTrackThickness - offset) / 2,
+            trackBounds.right - offset / 2,
+            (displayedTrackThickness - offset) / 2);
     canvas.drawRoundRect(stopBounds, displayedCornerRadius, displayedCornerRadius, paint);
   }
 

diff --git a/lib/java/com/google/android/material/progressindicator/res/values/styles.xml b/lib/java/com/google/android/material/progressindicator/res/values/styles.xml
@@ -47,19 +47,54 @@
     <item name="indicatorInset">@dimen/mtrl_progress_circular_inset_extra_small</item>
   </style>
 
+  <!-- M3 LinearProgressIndicator Legacy style -->
+  <style name="Widget.Material3.LinearProgressIndicator.Legacy" parent="Widget.MaterialComponents.LinearProgressIndicator">
+    <item name="trackThickness">@dimen/m3_comp_linear_progress_indicator_active_indicator_height</item>
+    <item name="trackColor">@macro/m3_comp_linear_progress_indicator_track_color</item>
+    <item name="indicatorColor">@macro/m3_comp_linear_progress_indicator_active_indicator_color</item>
+  </style>
+
+  <!-- M3 CircularProgressIndicator Legacy styles -->
+  <style name="Widget.Material3.CircularProgressIndicator.Legacy" parent="Widget.MaterialComponents.CircularProgressIndicator">
+    <item name="trackThickness">@dimen/m3_comp_circular_progress_indicator_active_indicator_width</item>
+    <item name="indicatorColor">@macro/m3_comp_circular_progress_indicator_active_indicator_color</item>
+  </style>
+  <style name="Widget.Material3.CircularProgressIndicator.Legacy.Medium" parent="Widget.MaterialComponents.CircularProgressIndicator.Medium"/>
+  <style name="Widget.Material3.CircularProgressIndicator.Legacy.Small" parent="Widget.MaterialComponents.CircularProgressIndicator.Small"/>
+  <style name="Widget.Material3.CircularProgressIndicator.Legacy.ExtraSmall" parent="Widget.MaterialComponents.CircularProgressIndicator.ExtraSmall"/>
+
   <!-- M3 LinearProgressIndicator style -->
   <style name="Widget.Material3.LinearProgressIndicator" parent="Widget.MaterialComponents.LinearProgressIndicator">
     <item name="trackThickness">@dimen/m3_comp_linear_progress_indicator_active_indicator_height</item>
-    <item name="trackColor">@macro/m3_comp_linear_progress_indicator_track_color</item>
+    <item name="trackColor">?attr/colorPrimaryContainer</item>
     <item name="indicatorColor">@macro/m3_comp_linear_progress_indicator_active_indicator_color</item>
+    <item name="trackCornerRadius">2dp</item>
+    <item name="indicatorTrackGapSize">4dp</item>
+    <item name="trackStopIndicatorSize">4dp</item>
   </style>
 
-  <!-- M3 CircularProgressIndicator styles -->
+  <!-- M3 CircularProgressIndicator style -->
   <style name="Widget.Material3.CircularProgressIndicator" parent="Widget.MaterialComponents.CircularProgressIndicator">
     <item name="trackThickness">@dimen/m3_comp_circular_progress_indicator_active_indicator_width</item>
     <item name="indicatorColor">@macro/m3_comp_circular_progress_indicator_active_indicator_color</item>
+    <item name="trackColor">?attr/colorPrimaryContainer</item>
+    <item name="trackCornerRadius">2dp</item>
+    <item name="indicatorTrackGapSize">4dp</item>
   </style>
-  <style name="Widget.Material3.CircularProgressIndicator.Medium" parent="Widget.MaterialComponents.CircularProgressIndicator.Medium"/>
-  <style name="Widget.Material3.CircularProgressIndicator.Small" parent="Widget.MaterialComponents.CircularProgressIndicator.Small"/>
-  <style name="Widget.Material3.CircularProgressIndicator.ExtraSmall" parent="Widget.MaterialComponents.CircularProgressIndicator.ExtraSmall"/>
+  <style name="Widget.Material3.CircularProgressIndicator.Medium"/>
+  <style name="Widget.Material3.CircularProgressIndicator.Small">
+    <item name="trackThickness">@dimen/mtrl_progress_circular_track_thickness_small</item>
+    <item name="indicatorSize">@dimen/mtrl_progress_circular_size_small</item>
+    <item name="indicatorInset">@dimen/mtrl_progress_circular_inset_small</item>
+    <item name="trackCornerRadius">1.5dp</item>
+    <item name="indicatorTrackGapSize">3dp</item>
+  </style>
+  <style name="Widget.Material3.CircularProgressIndicator.ExtraSmall">
+    <item name="trackThickness">@dimen/mtrl_progress_circular_track_thickness_extra_small</item>
+    <item name="indicatorSize">@dimen/mtrl_progress_circular_size_extra_small</item>
+    <item name="indicatorInset">@dimen/mtrl_progress_circular_inset_extra_small</item>
+    <item name="trackCornerRadius">1.25dp</item>
+    <item name="indicatorTrackGapSize">2dp</item>
+  </style>
+
 </resources>