File tree 3 files changed +34
-0
lines changed
lib/java/com/google/android/material
progressindicator/res/values
3 files changed +34
-0
lines changed Original file line number Diff line number Diff line change 16
16
-->
17
17
<resources >
18
18
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
+
19
41
<!-- Styles for M3 ProgressIndicator. -->
20
42
21
43
<!-- M3 LinearProgressIndicator style -->
Original file line number Diff line number Diff line change 30
30
<dimen name =" m3_comp_progress_indicator_linear_track_thickness" >4dp</dimen >
31
31
<dimen name =" m3_comp_progress_indicator_linear_stop_indicator_size" >4dp</dimen >
32
32
<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 >
33
36
34
37
<!-- Generated from token set (md.comp.progress-indicator.circular) in context (platform=android,
35
38
audience=3p). -->
36
39
<!-- Group: Circular - baseline -->
37
40
<dimen name =" m3_comp_progress_indicator_circular_size" >40dp</dimen >
41
+ <dimen name =" m3_comp_progress_indicator_circular_with_wave_size" >48dp</dimen >
38
42
<dimen name =" m3_comp_progress_indicator_circular_track_thickness" >4dp</dimen >
39
43
<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 >
40
46
41
47
</resources >
Original file line number Diff line number Diff line change 74
74
<item name =" toolbarStyle" >@style/Widget.Material3Expressive.Toolbar</item >
75
75
<item name =" toolbarSurfaceStyle" >@style/Widget.Material3Expressive.Toolbar.Surface</item >
76
76
77
+ <item name =" linearProgressIndicatorStyle" >@style/Widget.Material3Expressive.LinearProgressIndicator</item >
78
+ <item name =" circularProgressIndicatorStyle" >@style/Widget.Material3Expressive.CircularProgressIndicator</item >
79
+
77
80
<item name =" sliderStyle" >@style/Widget.Material3Expressive.Slider.Xsmall</item >
78
81
79
82
<!-- Top App Bars. -->
134
137
<item name =" toolbarStyle" >@style/Widget.Material3Expressive.Toolbar</item >
135
138
<item name =" toolbarSurfaceStyle" >@style/Widget.Material3Expressive.Toolbar.Surface</item >
136
139
140
+ <item name =" linearProgressIndicatorStyle" >@style/Widget.Material3Expressive.LinearProgressIndicator</item >
141
+ <item name =" circularProgressIndicatorStyle" >@style/Widget.Material3Expressive.CircularProgressIndicator</item >
142
+
137
143
<item name =" sliderStyle" >@style/Widget.Material3Expressive.Slider.Xsmall</item >
138
144
139
145
<!-- Top App Bars. -->
You can’t perform that action at this time.
0 commit comments