From 25606cf34addae1420eeba24eec0f90aef06d0d2 Mon Sep 17 00:00:00 2001
From: raajkumars <raajkumars@google.com>
Date: Mon, 9 May 2022 14:37:20 -0400
Subject: [PATCH] [Button] Updated M3 button style to add filled icon button
 style. Updated catalog to showcase the same.

PiperOrigin-RevId: 447523530
---
 .../res/layout/cat_buttons_fragment.xml       |  50 ++++++++++++++++--
 .../catalog/button/res/values/strings.xml     |   2 +
 docs/components/Button.md                     |  38 ++++++++++---
 .../assets/buttons/filled-icon-button.png     | Bin 0 -> 4270 bytes
 .../button/res-public/values/public.xml       |   2 +
 .../material/button/res/values/attrs.xml      |   2 +
 .../material/button/res/values/styles.xml     |   6 +++
 ...d_icon_button_container_color_selector.xml |  22 ++++++++
 ...filled_icon_button_icon_color_selector.xml |  22 ++++++++
 .../dialog/res/values/themes_base.xml         |   2 +
 .../material/theme/res/values/themes_base.xml |   2 +
 11 files changed, 137 insertions(+), 11 deletions(-)
 create mode 100644 docs/components/assets/buttons/filled-icon-button.png
 create mode 100644 lib/java/com/google/android/material/color/res/color/m3_filled_icon_button_container_color_selector.xml
 create mode 100644 lib/java/com/google/android/material/color/res/color/m3_filled_icon_button_icon_color_selector.xml

diff --git a/catalog/java/io/material/catalog/button/res/layout/cat_buttons_fragment.xml b/catalog/java/io/material/catalog/button/res/layout/cat_buttons_fragment.xml
index 1857f30dfaa..a8964d1d4b6 100644
--- a/catalog/java/io/material/catalog/button/res/layout/cat_buttons_fragment.xml
+++ b/catalog/java/io/material/catalog/button/res/layout/cat_buttons_fragment.xml
@@ -132,12 +132,52 @@
           android:text="@string/cat_outlined_icon_btn_text"
           android:textSize="16sp"/>
 
-      <Button
-          style="@style/Widget.Material3.Button.IconButton"
-          android:layout_width="wrap_content"
+      <LinearLayout
+          android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:contentDescription="@string/cat_button_icon_btn_text"
-          app:icon="@drawable/ic_dialogs_24px"/>
+          android:paddingTop="8dp"
+          android:paddingBottom="8dp"
+          android:gravity="center_horizontal"
+          android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+          <Button
+              style="?attr/materialIconButtonStyle"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:contentDescription="@string/cat_button_icon_btn_text"
+              app:icon="@drawable/ic_dialogs_24px"/>
+          <TextView
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:paddingTop="4dp"
+              android:text="@string/cat_icon_btn_default_style"
+              android:textSize="12sp"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+          <Button
+              style="?attr/materialIconButtonFilledStyle"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:contentDescription="@string/cat_button_icon_btn_text"
+              app:icon="@drawable/ic_dialogs_24px"/>
+          <TextView
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:paddingTop="4dp"
+              android:text="@string/cat_icon_btn_filled_style"
+              android:textSize="12sp"/>
+        </LinearLayout>
+      </LinearLayout>
 
       <com.google.android.material.switchmaterial.SwitchMaterial
           android:id="@+id/cat_button_enabled_switch"
diff --git a/catalog/java/io/material/catalog/button/res/values/strings.xml b/catalog/java/io/material/catalog/button/res/values/strings.xml
index e9074be5f07..87669d274c0 100644
--- a/catalog/java/io/material/catalog/button/res/values/strings.xml
+++ b/catalog/java/io/material/catalog/button/res/values/strings.xml
@@ -37,6 +37,8 @@
   <string name="cat_filled_buttons_section_title">Filled buttons</string>
   <string name="cat_outlined_btn_text">Outlined buttons</string>
   <string name="cat_outlined_icon_btn_text">Icon only buttons</string>
+  <string name="cat_icon_btn_default_style">Standard</string>
+  <string name="cat_icon_btn_filled_style">Filled</string>
   <string name="cat_button_clicked">Button clicked</string>
   <string name="cat_snackbar_action_button_text">Done</string>
 
diff --git a/docs/components/Button.md b/docs/components/Button.md
index f3d34fca2b1..fec67f790a2 100644
--- a/docs/components/Button.md
+++ b/docs/components/Button.md
@@ -820,7 +820,15 @@ icon.setOnCheckedChangeListener { checkBox, isChecked ->
 ## Icon button
 
 [Icon buttons](https://material.io/components/buttons/#icon-buttons) help users
-take supplementary actions with a single tap.
+take supplementary actions with a single tap. There are two types of icon
+buttons: standard and contained.
+
+*   **Standard icon button:** By default icon buttons will not have a container.
+*   **Contained icon button:** Optionally, it is possible to have a container
+    around the icon.
+
+See [Icon button examples](#icon-button-examples) section below for more
+information.
 
 ### Usage
 
@@ -839,6 +847,8 @@ API and source code:
     *   [Class description](https://developer.android.com/reference/com/google/android/material/button/MaterialButton)
     *   [Class source](https://github.com/material-components/material-components-android/tree/master/lib/java/com/google/android/material/button/MaterialButton.java)
 
+#### Standard Icon button
+
 The following example shows a standard icon button.
 
 !["Standard icon button example for Android over a white background."](assets/buttons/icon-button-standard.png)
@@ -862,13 +872,29 @@ iconButton.addOnButtonCheckedListener { iconButton, checkedId, isChecked ->
 }
 ```
 
-#### Styles & Theme attributes
+#### Filled Icon button
 
-Element           | Style
------------------ | ------------------------------------
-**Default style** | `Widget.Material3.Button.IconButton`
+The following example shows a contained icon button that is filled.
+
+!["Filled icon button example for Android over a white background."](assets/buttons/filled-icon-button.png)
+
+In the layout:
+
+```xml
+<Button
+    style="?attr/materialIconButtonFilledStyle"
+    android:id="@+id/iconButton"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+/>
+```
+
+#### Styles & Theme attributes
 
-Default style theme attribute: `?attr/materialIconButtonStyle`
+Element                | Style                                       | Theme Attribute
+---------------------- | ------------------------------------------- | ---------------
+**Default style**      | `Widget.Material3.Button.IconButton`        | `?attr/materialIconButtonStyle`
+**Filled Icon Button** | `Widget.Material3.Button.IconButton.Filled` | `?attr/materialIconButtonFilledStyle`
 
 See the full list of
 [styles](https://github.com/material-components/material-components-android/tree/master/lib/java/com/google/android/material/button/res/values/styles.xml)
diff --git a/docs/components/assets/buttons/filled-icon-button.png b/docs/components/assets/buttons/filled-icon-button.png
new file mode 100644
index 0000000000000000000000000000000000000000..851cf386331fa99635cebd1d7d9a6a9b9e30f771
GIT binary patch
literal 4270
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
a<~Vbwra;@Oyng4m-O|+7q}<5;+`j=lokB(c

literal 0
HcmV?d00001

diff --git a/lib/java/com/google/android/material/button/res-public/values/public.xml b/lib/java/com/google/android/material/button/res-public/values/public.xml
index 368287ffb4a..f754f199a83 100644
--- a/lib/java/com/google/android/material/button/res-public/values/public.xml
+++ b/lib/java/com/google/android/material/button/res-public/values/public.xml
@@ -27,6 +27,7 @@
   <public name="iconTintMode" type="attr"/>
   <public name="materialButtonStyle" type="attr"/>
   <public name="materialIconButtonStyle" type="attr"/>
+  <public name="materialIconButtonFilledStyle" type="attr"/>
   <public name="materialButtonOutlinedStyle" type="attr"/>
   <public name="materialButtonToggleGroupStyle" type="attr"/>
   <public name="Widget.MaterialComponents.Button" type="style"/>
@@ -51,6 +52,7 @@
   <public name="Widget.Material3.Button.ElevatedButton" type="style"/>
   <public name="Widget.Material3.Button.ElevatedButton.Icon" type="style"/>
   <public name="Widget.Material3.Button.IconButton" type="style"/>
+  <public name="Widget.Material3.Button.IconButton.Filled" type="style"/>
   <public name="ShapeAppearanceOverlay.Material3.Button" type="style"/>
   <public name="ThemeOverlay.Material3.Button" type="style"/>
   <public name="ThemeOverlay.Material3.Button.ElevatedButton" type="style"/>
diff --git a/lib/java/com/google/android/material/button/res/values/attrs.xml b/lib/java/com/google/android/material/button/res/values/attrs.xml
index 810d909679b..f5405d54ce3 100644
--- a/lib/java/com/google/android/material/button/res/values/attrs.xml
+++ b/lib/java/com/google/android/material/button/res/values/attrs.xml
@@ -21,6 +21,8 @@
   <attr name="materialButtonStyle" format="reference"/>
   <!-- Style to use for Material Icon Only Buttons in this theme. -->
   <attr name="materialIconButtonStyle" format="reference"/>
+  <!-- Style to use for Filled Material Icon Only Buttons in this theme. -->
+  <attr name="materialIconButtonFilledStyle" format="reference"/>
   <!-- Style to use for Material Outlined Buttons in this theme. -->
   <attr name="materialButtonOutlinedStyle" format="reference"/>
   <!-- Style to use for MaterialButtonToggleGroups in this theme. -->
diff --git a/lib/java/com/google/android/material/button/res/values/styles.xml b/lib/java/com/google/android/material/button/res/values/styles.xml
index 1e0be115144..220f7c8be50 100644
--- a/lib/java/com/google/android/material/button/res/values/styles.xml
+++ b/lib/java/com/google/android/material/button/res/values/styles.xml
@@ -274,6 +274,12 @@
     <item name="iconPadding">@dimen/m3_btn_icon_only_icon_padding</item>
   </style>
 
+  <style name="Widget.Material3.Button.IconButton.Filled">
+    <item name="backgroundTint">@color/m3_filled_icon_button_container_color_selector</item>
+    <item name="iconTint">@color/m3_filled_icon_button_icon_color_selector</item>
+    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.Button</item>
+  </style>
+
   <!-- DEPRECATED -->
   <style name="ShapeAppearanceOverlay.Material3.Button" parent="">
     <item name="cornerSize">50%</item>
diff --git a/lib/java/com/google/android/material/color/res/color/m3_filled_icon_button_container_color_selector.xml b/lib/java/com/google/android/material/color/res/color/m3_filled_icon_button_container_color_selector.xml
new file mode 100644
index 00000000000..a086b1a501f
--- /dev/null
+++ b/lib/java/com/google/android/material/color/res/color/m3_filled_icon_button_container_color_selector.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+<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"/>
+  <!-- Default, Enabled state -->
+  <item android:color="?attr/colorContainer"/>
+</selector>
diff --git a/lib/java/com/google/android/material/color/res/color/m3_filled_icon_button_icon_color_selector.xml b/lib/java/com/google/android/material/color/res/color/m3_filled_icon_button_icon_color_selector.xml
new file mode 100644
index 00000000000..3016318f437
--- /dev/null
+++ b/lib/java/com/google/android/material/color/res/color/m3_filled_icon_button_icon_color_selector.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+<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"/>
+  <!-- Default, Enabled state -->
+  <item android:color="?attr/colorOnContainer"/>
+</selector>
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 cedda0d1215..1eed1d4b30f 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
@@ -105,6 +105,7 @@
     <item name="floatingActionButtonLargeSurfaceStyle">@style/Widget.Material3.FloatingActionButton.Large.Surface</item>
     <item name="linearProgressIndicatorStyle">@style/Widget.Material3.LinearProgressIndicator</item>
     <item name="materialIconButtonStyle">@style/Widget.Material3.Button.IconButton</item>
+    <item name="materialIconButtonFilledStyle">@style/Widget.Material3.Button.IconButton.Filled</item>
     <item name="materialButtonOutlinedStyle">@style/Widget.Material3.Button.OutlinedButton</item>
     <item name="materialButtonStyle">@style/Widget.Material3.Button</item>
     <item name="materialCardViewStyle">?attr/materialCardViewOutlinedStyle</item>
@@ -330,6 +331,7 @@
     <item name="floatingActionButtonLargeSurfaceStyle">@style/Widget.Material3.FloatingActionButton.Large.Surface</item>
     <item name="linearProgressIndicatorStyle">@style/Widget.Material3.LinearProgressIndicator</item>
     <item name="materialIconButtonStyle">@style/Widget.Material3.Button.IconButton</item>
+    <item name="materialIconButtonFilledStyle">@style/Widget.Material3.Button.IconButton.Filled</item>
     <item name="materialButtonOutlinedStyle">@style/Widget.Material3.Button.OutlinedButton</item>
     <item name="materialButtonStyle">@style/Widget.Material3.Button</item>
     <item name="materialCardViewStyle">?attr/materialCardViewOutlinedStyle</item>
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 8811779708e..9156fef1d9b 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
@@ -119,6 +119,7 @@
     <item name="floatingActionButtonLargeSurfaceStyle">@style/Widget.Material3.FloatingActionButton.Large.Surface</item>
     <item name="linearProgressIndicatorStyle">@style/Widget.Material3.LinearProgressIndicator</item>
     <item name="materialIconButtonStyle">@style/Widget.Material3.Button.IconButton</item>
+    <item name="materialIconButtonFilledStyle">@style/Widget.Material3.Button.IconButton.Filled</item>
     <item name="materialButtonOutlinedStyle">@style/Widget.Material3.Button.OutlinedButton</item>
     <item name="materialButtonStyle">@style/Widget.Material3.Button</item>
     <item name="materialCardViewStyle">?attr/materialCardViewOutlinedStyle</item>
@@ -346,6 +347,7 @@
     <item name="floatingActionButtonLargeSurfaceStyle">@style/Widget.Material3.FloatingActionButton.Large.Surface</item>
     <item name="linearProgressIndicatorStyle">@style/Widget.Material3.LinearProgressIndicator</item>
     <item name="materialIconButtonStyle">@style/Widget.Material3.Button.IconButton</item>
+    <item name="materialIconButtonFilledStyle">@style/Widget.Material3.Button.IconButton.Filled</item>
     <item name="materialButtonOutlinedStyle">@style/Widget.Material3.Button.OutlinedButton</item>
     <item name="materialButtonStyle">@style/Widget.Material3.Button</item>
     <item name="materialCardViewStyle">?attr/materialCardViewOutlinedStyle</item>