Skip to content

Commit 1e08c68

Browse files
drchenafohrman
authored andcommittedMay 25, 2022
[Switch] Add material switch style to M3 themes
Also add public attributes to public.xml Resolves #2527 PiperOrigin-RevId: 450782655
1 parent 3db2109 commit 1e08c68

File tree

4 files changed

+13
-0
lines changed

4 files changed

+13
-0
lines changed
 

‎lib/java/com/google/android/material/dialog/res/values/themes_base.xml

+2
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@
119119
<item name="materialCardViewOutlinedStyle">@style/Widget.Material3.CardView.Outlined</item>
120120
<item name="materialCardViewFilledStyle">@style/Widget.Material3.CardView.Filled</item>
121121
<item name="materialCardViewElevatedStyle">@style/Widget.Material3.CardView.Elevated</item>
122+
<item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
122123
<item name="navigationRailStyle">@style/Widget.Material3.NavigationRailView</item>
123124
<item name="navigationViewStyle">@style/Widget.Material3.NavigationView</item>
124125
<item name="radioButtonStyle">@style/Widget.Material3.CompoundButton.RadioButton</item>
@@ -352,6 +353,7 @@
352353
<item name="materialCardViewOutlinedStyle">@style/Widget.Material3.CardView.Outlined</item>
353354
<item name="materialCardViewFilledStyle">@style/Widget.Material3.CardView.Filled</item>
354355
<item name="materialCardViewElevatedStyle">@style/Widget.Material3.CardView.Elevated</item>
356+
<item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
355357
<item name="navigationRailStyle">@style/Widget.Material3.NavigationRailView</item>
356358
<item name="navigationViewStyle">@style/Widget.Material3.NavigationView</item>
357359
<item name="radioButtonStyle">@style/Widget.Material3.CompoundButton.RadioButton</item>

‎lib/java/com/google/android/material/materialswitch/res-public/public.xml

+8
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,12 @@
1515
-->
1616
<resources>
1717
<public name="materialSwitchStyle" type="attr"/>
18+
<public name="Widget.Material3.CompoundButton.MaterialSwitch" type="style"/>
19+
20+
<public name="thumbIcon" type="attr"/>
21+
<public name="thumbIconTint" type="attr"/>
22+
<public name="thumbIconTintMode" type="attr"/>
23+
<public name="trackDecoration" type="attr"/>
24+
<public name="trackDecorationTint" type="attr"/>
25+
<public name="trackDecorationTintMode" type="attr"/>
1826
</resources>

‎lib/java/com/google/android/material/theme/res/values/themes_base.xml

+2
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@
133133
<item name="materialCardViewOutlinedStyle">@style/Widget.Material3.CardView.Outlined</item>
134134
<item name="materialCardViewFilledStyle">@style/Widget.Material3.CardView.Filled</item>
135135
<item name="materialCardViewElevatedStyle">@style/Widget.Material3.CardView.Elevated</item>
136+
<item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
136137
<item name="navigationRailStyle">@style/Widget.Material3.NavigationRailView</item>
137138
<item name="navigationViewStyle">@style/Widget.Material3.NavigationView</item>
138139
<item name="radioButtonStyle">@style/Widget.Material3.CompoundButton.RadioButton</item>
@@ -368,6 +369,7 @@
368369
<item name="materialCardViewOutlinedStyle">@style/Widget.Material3.CardView.Outlined</item>
369370
<item name="materialCardViewFilledStyle">@style/Widget.Material3.CardView.Filled</item>
370371
<item name="materialCardViewElevatedStyle">@style/Widget.Material3.CardView.Elevated</item>
372+
<item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
371373
<item name="navigationRailStyle">@style/Widget.Material3.NavigationRailView</item>
372374
<item name="navigationViewStyle">@style/Widget.Material3.NavigationView</item>
373375
<item name="radioButtonStyle">@style/Widget.Material3.CompoundButton.RadioButton</item>

‎lib/javatests/com/google/android/material/theme/ThemeTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,7 @@ public class ThemeTest {
380380
R.attr.materialCardViewOutlinedStyle,
381381
R.attr.materialCardViewFilledStyle,
382382
R.attr.materialCardViewElevatedStyle,
383+
R.attr.materialSwitchStyle,
383384
R.attr.radioButtonStyle,
384385
R.attr.sliderStyle,
385386
R.attr.snackbarStyle,

0 commit comments

Comments
 (0)
Please sign in to comment.