File tree Expand file tree Collapse file tree 3 files changed +34
-0
lines changed
lib/java/com/google/android/material
progressindicator/res/values Expand file tree Collapse file tree 3 files changed +34
-0
lines changed Original file line number Diff line number Diff line change 1616-->
1717<resources >
1818
19+ <!-- Styles for M3 Expressive ProgressIndicator. -->
20+
21+ <style name =" Widget.Material3Expressive.LinearProgressIndicator" parent =" Widget.Material3.LinearProgressIndicator" />
22+
23+ <style name =" Widget.Material3Expressive.LinearProgressIndicator.Wavy" >
24+ <item name =" waveAmplitude" >@dimen/m3_comp_progress_indicator_linear_active_indicator_wave_amplitude</item >
25+ <item name =" wavelength" >@dimen/m3_comp_progress_indicator_linear_active_indicator_wave_wavelength</item >
26+ <item name =" wavelengthIndeterminate" >@dimen/m3_comp_progress_indicator_linear_indeterminate_active_indicator_wave_wavelength</item >
27+ </style >
28+
29+ <style name =" Widget.Material3Expressive.CircularProgressIndicator" parent =" Widget.Material3.CircularProgressIndicator" >
30+ <item name =" indeterminateAnimationTypeCircular" >retreat</item >
31+ <item name =" indeterminateTrackVisible" >true</item >
32+ </style >
33+
34+ <style name =" Widget.Material3Expressive.CircularProgressIndicator.Wavy" >
35+ <item name =" indicatorSize" >@dimen/m3_comp_progress_indicator_circular_with_wave_size</item >
36+ <item name =" indicatorInset" >0dp</item >
37+ <item name =" waveAmplitude" >@dimen/m3_comp_progress_indicator_circular_active_indicator_wave_amplitude</item >
38+ <item name =" wavelength" >@dimen/m3_comp_progress_indicator_circular_active_indicator_wave_wavelength</item >
39+ </style >
40+
1941 <!-- Styles for M3 ProgressIndicator. -->
2042
2143 <!-- M3 LinearProgressIndicator style -->
Original file line number Diff line number Diff line change 3030 <dimen name =" m3_comp_progress_indicator_linear_track_thickness" >4dp</dimen >
3131 <dimen name =" m3_comp_progress_indicator_linear_stop_indicator_size" >4dp</dimen >
3232 <dimen name =" m3_comp_progress_indicator_linear_track_active_indicator_space" >4dp</dimen >
33+ <dimen name =" m3_comp_progress_indicator_linear_active_indicator_wave_amplitude" >3dp</dimen >
34+ <dimen name =" m3_comp_progress_indicator_linear_active_indicator_wave_wavelength" >40dp</dimen >
35+ <dimen name =" m3_comp_progress_indicator_linear_indeterminate_active_indicator_wave_wavelength" >20dp</dimen >
3336
3437 <!-- Generated from token set (md.comp.progress-indicator.circular) in context (platform=android,
3538 audience=3p). -->
3639 <!-- Group: Circular - baseline -->
3740 <dimen name =" m3_comp_progress_indicator_circular_size" >40dp</dimen >
41+ <dimen name =" m3_comp_progress_indicator_circular_with_wave_size" >48dp</dimen >
3842 <dimen name =" m3_comp_progress_indicator_circular_track_thickness" >4dp</dimen >
3943 <dimen name =" m3_comp_progress_indicator_circular_track_active_indicator_space" >4dp</dimen >
44+ <dimen name =" m3_comp_progress_indicator_circular_active_indicator_wave_amplitude" >1.6dp</dimen >
45+ <dimen name =" m3_comp_progress_indicator_circular_active_indicator_wave_wavelength" >15dp</dimen >
4046
4147</resources >
Original file line number Diff line number Diff line change 7474 <item name =" toolbarStyle" >@style/Widget.Material3Expressive.Toolbar</item >
7575 <item name =" toolbarSurfaceStyle" >@style/Widget.Material3Expressive.Toolbar.Surface</item >
7676
77+ <item name =" linearProgressIndicatorStyle" >@style/Widget.Material3Expressive.LinearProgressIndicator</item >
78+ <item name =" circularProgressIndicatorStyle" >@style/Widget.Material3Expressive.CircularProgressIndicator</item >
79+
7780 <item name =" sliderStyle" >@style/Widget.Material3Expressive.Slider.Xsmall</item >
7881
7982 <!-- Top App Bars. -->
134137 <item name =" toolbarStyle" >@style/Widget.Material3Expressive.Toolbar</item >
135138 <item name =" toolbarSurfaceStyle" >@style/Widget.Material3Expressive.Toolbar.Surface</item >
136139
140+ <item name =" linearProgressIndicatorStyle" >@style/Widget.Material3Expressive.LinearProgressIndicator</item >
141+ <item name =" circularProgressIndicatorStyle" >@style/Widget.Material3Expressive.CircularProgressIndicator</item >
142+
137143 <item name =" sliderStyle" >@style/Widget.Material3Expressive.Slider.Xsmall</item >
138144
139145 <!-- Top App Bars. -->
You can’t perform that action at this time.
0 commit comments