[ProgressIndicator] Integrates tokens into M3 styles.

PiperOrigin-RevId: 474592726
material-components · Sep 15, 2022 · ab063b7 · ab063b7
1 parent e804957
commit ab063b7
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
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
@@ -49,11 +49,16 @@
 
   <!-- M3 LinearProgressIndicator style -->
   <style name="Widget.Material3.LinearProgressIndicator" parent="Widget.MaterialComponents.LinearProgressIndicator">
-    <item name="trackColor">?attr/colorSurfaceVariant</item>
+    <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 styles -->
-  <style name="Widget.Material3.CircularProgressIndicator" parent="Widget.MaterialComponents.CircularProgressIndicator" />
+  <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>
+  </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"/>

diff --git a/lib/java/com/google/android/material/progressindicator/res/values/tokens.xml b/lib/java/com/google/android/material/progressindicator/res/values/tokens.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
+<!-- Version: v0.99 -->
+
+<resources>
+  <!-- Generated from token set (md.comp.linear-progress-indicator) in default context. -->
+  <!-- Enabled - Track -->
+  <macro name="m3_comp_linear_progress_indicator_track_color">?attr/colorSurfaceVariant</macro>
+  <!-- Enabled - Active indicator -->
+  <dimen name="m3_comp_linear_progress_indicator_active_indicator_height">4dp</dimen>
+  <macro name="m3_comp_linear_progress_indicator_active_indicator_color">?attr/colorPrimary</macro>
+
+  <!-- Generated from token set (md.comp.circular-progress-indicator) in default context. -->
+  <!-- Enabled - Active indicator -->
+  <dimen name="m3_comp_circular_progress_indicator_active_indicator_width">4dp</dimen>
+  <macro name="m3_comp_circular_progress_indicator_active_indicator_color">?attr/colorPrimary</macro>
+</resources>