From 1e08c680d41fd55263246a555f6d97a27ce9c540 Mon Sep 17 00:00:00 2001
From: conradchen <conradchen@google.com>
Date: Tue, 24 May 2022 18:25:33 -0400
Subject: [PATCH] [Switch] Add material switch style to M3 themes

Also add public attributes to public.xml

Resolves https://github.com/material-components/material-components-android/issues/2527

PiperOrigin-RevId: 450782655
---
 .../android/material/dialog/res/values/themes_base.xml    | 2 ++
 .../android/material/materialswitch/res-public/public.xml | 8 ++++++++
 .../android/material/theme/res/values/themes_base.xml     | 2 ++
 .../com/google/android/material/theme/ThemeTest.java      | 1 +
 4 files changed, 13 insertions(+)

diff --git a/lib/java/com/google/android/material/dialog/res/values/themes_base.xml b/lib/java/com/google/android/material/dialog/res/values/themes_base.xml
index 3a0f1a49db0..7fe851ffa79 100644
--- a/lib/java/com/google/android/material/dialog/res/values/themes_base.xml
+++ b/lib/java/com/google/android/material/dialog/res/values/themes_base.xml
@@ -119,6 +119,7 @@
     <item name="materialCardViewOutlinedStyle">@style/Widget.Material3.CardView.Outlined</item>
     <item name="materialCardViewFilledStyle">@style/Widget.Material3.CardView.Filled</item>
     <item name="materialCardViewElevatedStyle">@style/Widget.Material3.CardView.Elevated</item>
+    <item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
     <item name="navigationRailStyle">@style/Widget.Material3.NavigationRailView</item>
     <item name="navigationViewStyle">@style/Widget.Material3.NavigationView</item>
     <item name="radioButtonStyle">@style/Widget.Material3.CompoundButton.RadioButton</item>
@@ -352,6 +353,7 @@
     <item name="materialCardViewOutlinedStyle">@style/Widget.Material3.CardView.Outlined</item>
     <item name="materialCardViewFilledStyle">@style/Widget.Material3.CardView.Filled</item>
     <item name="materialCardViewElevatedStyle">@style/Widget.Material3.CardView.Elevated</item>
+    <item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
     <item name="navigationRailStyle">@style/Widget.Material3.NavigationRailView</item>
     <item name="navigationViewStyle">@style/Widget.Material3.NavigationView</item>
     <item name="radioButtonStyle">@style/Widget.Material3.CompoundButton.RadioButton</item>
diff --git a/lib/java/com/google/android/material/materialswitch/res-public/public.xml b/lib/java/com/google/android/material/materialswitch/res-public/public.xml
index 6fa78285fdf..f8bfe2e00a3 100644
--- a/lib/java/com/google/android/material/materialswitch/res-public/public.xml
+++ b/lib/java/com/google/android/material/materialswitch/res-public/public.xml
@@ -15,4 +15,12 @@
 -->
 <resources>
   <public name="materialSwitchStyle" type="attr"/>
+  <public name="Widget.Material3.CompoundButton.MaterialSwitch" type="style"/>
+
+  <public name="thumbIcon" type="attr"/>
+  <public name="thumbIconTint" type="attr"/>
+  <public name="thumbIconTintMode" type="attr"/>
+  <public name="trackDecoration" type="attr"/>
+  <public name="trackDecorationTint" type="attr"/>
+  <public name="trackDecorationTintMode" type="attr"/>
 </resources>
diff --git a/lib/java/com/google/android/material/theme/res/values/themes_base.xml b/lib/java/com/google/android/material/theme/res/values/themes_base.xml
index 78389aa95d2..21d158314b0 100644
--- a/lib/java/com/google/android/material/theme/res/values/themes_base.xml
+++ b/lib/java/com/google/android/material/theme/res/values/themes_base.xml
@@ -133,6 +133,7 @@
     <item name="materialCardViewOutlinedStyle">@style/Widget.Material3.CardView.Outlined</item>
     <item name="materialCardViewFilledStyle">@style/Widget.Material3.CardView.Filled</item>
     <item name="materialCardViewElevatedStyle">@style/Widget.Material3.CardView.Elevated</item>
+    <item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
     <item name="navigationRailStyle">@style/Widget.Material3.NavigationRailView</item>
     <item name="navigationViewStyle">@style/Widget.Material3.NavigationView</item>
     <item name="radioButtonStyle">@style/Widget.Material3.CompoundButton.RadioButton</item>
@@ -368,6 +369,7 @@
     <item name="materialCardViewOutlinedStyle">@style/Widget.Material3.CardView.Outlined</item>
     <item name="materialCardViewFilledStyle">@style/Widget.Material3.CardView.Filled</item>
     <item name="materialCardViewElevatedStyle">@style/Widget.Material3.CardView.Elevated</item>
+    <item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
     <item name="navigationRailStyle">@style/Widget.Material3.NavigationRailView</item>
     <item name="navigationViewStyle">@style/Widget.Material3.NavigationView</item>
     <item name="radioButtonStyle">@style/Widget.Material3.CompoundButton.RadioButton</item>
diff --git a/lib/javatests/com/google/android/material/theme/ThemeTest.java b/lib/javatests/com/google/android/material/theme/ThemeTest.java
index 4ddaf09dafb..7582b7cfb2c 100644
--- a/lib/javatests/com/google/android/material/theme/ThemeTest.java
+++ b/lib/javatests/com/google/android/material/theme/ThemeTest.java
@@ -380,6 +380,7 @@ public class ThemeTest {
           R.attr.materialCardViewOutlinedStyle,
           R.attr.materialCardViewFilledStyle,
           R.attr.materialCardViewElevatedStyle,
+          R.attr.materialSwitchStyle,
           R.attr.radioButtonStyle,
           R.attr.sliderStyle,
           R.attr.snackbarStyle,