Automated g4 rollback of changelist 458476376

PiperOrigin-RevId: 458490930

Author: Material Design Team

lib/java/com/google/android/material/button/res/values/styles.xml

@@ -271,19 +271,18 @@
     <item name="android:insetLeft">@dimen/m3_btn_inset</item>
     <item name="android:insetRight">@dimen/m3_btn_inset</item>
     <item name="iconSize">@dimen/m3_btn_icon_only_default_size</item>
-    <item name="iconTint">@color/m3_icon_button_icon_color_selector</item>
     <item name="iconPadding">@dimen/m3_btn_icon_only_icon_padding</item>
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.Button.IconButton</item>
   </style>
 
   <style name="Widget.Material3.Button.IconButton.Filled">
     <item name="backgroundTint">@color/m3_filled_icon_button_container_color_selector</item>
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.Button.IconButton.Filled</item>
+    <item name="iconTint">@color/m3_filled_icon_button_icon_color_selector</item>
+    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.Button</item>
   </style>
 
   <style name="Widget.Material3.Button.IconButton.Filled.Tonal">
     <item name="rippleColor">@color/m3_tonal_button_ripple_color_selector</item>
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.Button.IconButton.Filled.Tonal</item>
+    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.Button.TonalButton</item>
   </style>
 
   <style name="Widget.Material3.Button.IconButton.Outlined">
@@ -324,19 +323,4 @@
     <item name="colorContainer">?attr/colorSurface</item>
   </style>
 
-  <style name="ThemeOverlay.Material3.Button.IconButton" parent="ThemeOverlay.Material3.Button.TextButton">
-    <!-- The colors used by the color selectors -->
-    <item name="colorOnContainerUnchecked">?attr/colorOnSurfaceVariant</item>
-  </style>
-
-  <style name="ThemeOverlay.Material3.Button.IconButton.Filled" parent="ThemeOverlay.Material3.Button">
-    <!-- The colors used by the color selectors -->
-    <item name="colorOnContainerUnchecked">?attr/colorPrimary</item>
-  </style>
-
-  <style name="ThemeOverlay.Material3.Button.IconButton.Filled.Tonal" parent="ThemeOverlay.Material3.Button.TonalButton">
-    <!-- The colors used by the color selectors -->
-    <item name="colorOnContainerUnchecked">?attr/colorOnSurfaceVariant</item>
-  </style>
-
 </resources>

lib/java/com/google/android/material/color/res/color/m3_filled_icon_button_container_color_selector.xml

@@ -17,8 +17,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
   <!-- Disabled state -->
   <item android:color="?attr/colorOnSurface" android:alpha="@dimen/material_emphasis_disabled_background" android:state_enabled="false"/>
-  <!-- Checkable, unchecked state -->
-  <item android:color="?attr/colorSurfaceVariant" android:state_checkable="true" android:state_checked="false"/>
   <!-- Default, Enabled state -->
   <item android:color="?attr/colorContainer"/>
 </selector>

…r/m3_icon_button_icon_color_selector.xml …lled_icon_button_icon_color_selector.xmllib/java/com/google/android/material/color/res/color/m3_icon_button_icon_color_selector.xml renamed to lib/java/com/google/android/material/color/res/color/m3_filled_icon_button_icon_color_selector.xml lib/java/com/google/android/material/color/res/color/m3_icon_button_icon_color_selector.xml renamed to lib/java/com/google/android/material/color/res/color/m3_filled_icon_button_icon_color_selector.xml

@@ -17,8 +17,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
   <!-- Disabled state -->
   <item android:color="?attr/colorOnSurface" android:alpha="@dimen/material_emphasis_disabled" android:state_enabled="false"/>
-  <!-- Checkable, unchecked state -->
-  <item android:color="?attr/colorOnContainerUnchecked" android:state_checkable="true" android:state_checked="false"/>
   <!-- Default, Enabled state -->
   <item android:color="?attr/colorOnContainer"/>
 </selector>

lib/java/com/google/android/material/color/res/values/attrs.xml

@@ -99,9 +99,6 @@
   <!-- Color to use for foreground elements on top of colorContainer. -->
   <attr name="colorOnContainer" format="color"/>
 
-  <!-- Color to use for checkable foreground elements in unchecked state on top of colorContainer. -->
-  <attr name="colorOnContainerUnchecked" format="color"/>
-
   <!-- The scrim background that appears below modals and expanded navigation menus.
        The background can either be a color or a bitmap drawable with tileMode set to repeat. -->
   <attr name="scrimBackground" format="color|reference"/>