Skip to content

Commit c1e73c8

Browse files
kendrickumstattdleticiarossi
authored andcommitted
[SplitButton] Updated Split Button to match spec and address feedback.
Updated padding values on leading and trailing buttons and fixed the trailing icon sizing. Resolved screenshot diffs in the formatting fragment. PiperOrigin-RevId: 713303721
1 parent b4585cd commit c1e73c8

File tree

3 files changed

+34
-14
lines changed

3 files changed

+34
-14
lines changed

catalog/java/io/material/catalog/button/res/layout/cat_split_button_fragment.xml

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
<Button
4242
android:layout_width="wrap_content"
4343
android:layout_height="wrap_content"
44+
android:paddingTop="6dp"
45+
android:paddingBottom="6dp"
4446
android:paddingStart="@dimen/m3_comp_split_button_small_leading_button_leading_space"
4547
android:paddingEnd="@dimen/m3_comp_split_button_small_leading_button_trailing_space"
4648
android:minWidth="@dimen/mtrl_min_touch_target_size"
@@ -53,8 +55,8 @@
5355
android:id="@+id/expand_more_or_less_filled_icon"
5456
android:layout_width="wrap_content"
5557
android:layout_height="wrap_content"
56-
android:paddingStart="@dimen/m3_comp_split_button_small_trailing_button_leading_space"
57-
android:paddingEnd="@dimen/m3_comp_split_button_small_trailing_button_trailing_space"
58+
android:paddingStart="14dp"
59+
android:paddingEnd="14dp"
5860
android:minWidth="@dimen/mtrl_min_touch_target_size"
5961
android:contentDescription="@string/cat_split_button_label_chevron"
6062
app:icon="@drawable/m3_split_button_chevron_avd"/>
@@ -66,6 +68,8 @@
6668
<Button
6769
android:layout_width="wrap_content"
6870
android:layout_height="wrap_content"
71+
android:paddingTop="6dp"
72+
android:paddingBottom="6dp"
6973
android:paddingStart="@dimen/m3_comp_split_button_small_leading_button_leading_space"
7074
android:paddingEnd="@dimen/m3_comp_split_button_small_leading_button_trailing_space"
7175
android:minWidth="@dimen/mtrl_min_touch_target_size"
@@ -75,8 +79,8 @@
7579
android:id="@+id/expand_more_or_less_filled_label"
7680
android:layout_width="wrap_content"
7781
android:layout_height="wrap_content"
78-
android:paddingStart="@dimen/m3_comp_split_button_small_trailing_button_leading_space"
79-
android:paddingEnd="@dimen/m3_comp_split_button_small_trailing_button_trailing_space"
82+
android:paddingStart="14dp"
83+
android:paddingEnd="14dp"
8084
android:minWidth="@dimen/mtrl_min_touch_target_size"
8185
android:contentDescription="@string/cat_split_button_label_chevron"
8286
app:icon="@drawable/m3_split_button_chevron_avd"/>
@@ -88,6 +92,8 @@
8892
<Button
8993
android:layout_width="wrap_content"
9094
android:layout_height="wrap_content"
95+
android:paddingTop="6dp"
96+
android:paddingBottom="6dp"
9197
android:paddingStart="@dimen/m3_comp_split_button_small_leading_button_leading_space"
9298
android:paddingEnd="@dimen/m3_comp_split_button_small_leading_button_trailing_space"
9399
android:minWidth="@dimen/mtrl_min_touch_target_size"
@@ -99,8 +105,8 @@
99105
android:id="@+id/expand_more_or_less_filled"
100106
android:layout_width="wrap_content"
101107
android:layout_height="wrap_content"
102-
android:paddingStart="@dimen/m3_comp_split_button_small_trailing_button_leading_space"
103-
android:paddingEnd="@dimen/m3_comp_split_button_small_trailing_button_trailing_space"
108+
android:paddingStart="14dp"
109+
android:paddingEnd="14dp"
104110
android:minWidth="@dimen/mtrl_min_touch_target_size"
105111
android:contentDescription="@string/cat_split_button_label_chevron"
106112
app:icon="@drawable/m3_split_button_chevron_avd"/>
@@ -121,6 +127,8 @@
121127
style="?attr/materialButtonTonalStyle"
122128
android:layout_width="wrap_content"
123129
android:layout_height="wrap_content"
130+
android:paddingTop="6dp"
131+
android:paddingBottom="6dp"
124132
android:paddingStart="@dimen/m3_comp_split_button_small_leading_button_leading_space"
125133
android:paddingEnd="@dimen/m3_comp_split_button_small_leading_button_trailing_space"
126134
android:minWidth="@dimen/mtrl_min_touch_target_size"
@@ -133,10 +141,10 @@
133141
android:id="@+id/expand_more_or_less_tonal_icon"
134142
android:layout_width="wrap_content"
135143
android:layout_height="wrap_content"
144+
android:paddingStart="14dp"
145+
android:paddingEnd="14dp"
136146
android:contentDescription="@string/cat_split_button_label_chevron"
137147
app:icon="@drawable/m3_split_button_chevron_avd"
138-
android:paddingStart="@dimen/m3_comp_split_button_small_trailing_button_leading_space"
139-
android:paddingEnd="@dimen/m3_comp_split_button_small_trailing_button_trailing_space"
140148
android:minWidth="@dimen/mtrl_min_touch_target_size"/>
141149
</com.google.android.material.button.MaterialSplitButton>
142150

@@ -147,6 +155,8 @@
147155
style="?attr/materialButtonTonalStyle"
148156
android:layout_width="wrap_content"
149157
android:layout_height="wrap_content"
158+
android:paddingTop="6dp"
159+
android:paddingBottom="6dp"
150160
android:paddingStart="@dimen/m3_comp_split_button_small_leading_button_leading_space"
151161
android:paddingEnd="@dimen/m3_comp_split_button_small_leading_button_trailing_space"
152162
android:minWidth="@dimen/mtrl_min_touch_target_size"
@@ -156,8 +166,8 @@
156166
android:id="@+id/expand_more_or_less_tonal_label"
157167
android:layout_width="wrap_content"
158168
android:layout_height="wrap_content"
159-
android:paddingStart="@dimen/m3_comp_split_button_small_trailing_button_leading_space"
160-
android:paddingEnd="@dimen/m3_comp_split_button_small_trailing_button_trailing_space"
169+
android:paddingStart="14dp"
170+
android:paddingEnd="14dp"
161171
android:minWidth="@dimen/mtrl_min_touch_target_size"
162172
android:contentDescription="@string/cat_split_button_label_chevron"
163173
app:icon="@drawable/m3_split_button_chevron_avd"/>
@@ -170,6 +180,8 @@
170180
style="?attr/materialButtonTonalStyle"
171181
android:layout_width="wrap_content"
172182
android:layout_height="wrap_content"
183+
android:paddingTop="6dp"
184+
android:paddingBottom="6dp"
173185
android:paddingStart="@dimen/m3_comp_split_button_small_leading_button_leading_space"
174186
android:paddingEnd="@dimen/m3_comp_split_button_small_leading_button_trailing_space"
175187
android:minWidth="@dimen/mtrl_min_touch_target_size"
@@ -181,8 +193,8 @@
181193
android:id="@+id/expand_more_or_less_tonal"
182194
android:layout_width="wrap_content"
183195
android:layout_height="wrap_content"
184-
android:paddingStart="@dimen/m3_comp_split_button_small_trailing_button_leading_space"
185-
android:paddingEnd="@dimen/m3_comp_split_button_small_trailing_button_trailing_space"
196+
android:paddingStart="14dp"
197+
android:paddingEnd="14dp"
186198
android:minWidth="@dimen/mtrl_min_touch_target_size"
187199
android:contentDescription="@string/cat_split_button_label_chevron"
188200
app:icon="@drawable/m3_split_button_chevron_avd"/>

lib/java/com/google/android/material/button/res/drawable/m3_split_button_chevron_avd.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,22 @@
1717
<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"
1818
xmlns:app="http://schemas.android.com/apk/res-auto"
1919
xmlns:tools="http://schemas.android.com/tools"
20-
android:width="22dp"
21-
android:height="22dp"
20+
android:width="20dp"
21+
android:height="20dp"
2222
tools:ignore="NewApi">
2323

2424
<item
2525
android:id="@+id/checked"
2626
android:drawable="@drawable/ic_expand_less_22px"
27+
app:iconSize="20dp"
28+
app:iconPadding="0dp"
2729
android:state_checked="true" />
2830

2931
<item
3032
android:id="@+id/unchecked"
3133
android:drawable="@drawable/ic_expand_more_22px"
34+
app:iconSize="20dp"
35+
app:iconPadding="0dp"
3236
android:state_checked="false" />
3337

3438
<transition

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@
144144

145145
<style name="Widget.Material3.SplitButton.IconButton.Filled" parent="Widget.Material3.Button.IconButton.Filled">
146146
<item name="android:insetLeft">0dp</item>
147+
<item name="android:paddingTop">6dp</item>
148+
<item name="android:paddingBottom">6dp</item>
147149
<item name="android:textColor">@color/m3_button_foreground_color_selector</item>
148150
<item name="iconTint">@color/m3_button_foreground_color_selector</item>
149151
<item name="backgroundTint">@color/m3_button_background_color_selector</item>
@@ -154,6 +156,8 @@
154156

155157
<style name="Widget.Material3.SplitButton.IconButton.Filled.Tonal" parent="Widget.Material3.Button.IconButton.Filled.Tonal">
156158
<item name="android:insetLeft">0dp</item>
159+
<item name="android:paddingTop">6dp</item>
160+
<item name="android:paddingBottom">6dp</item>
157161
<item name="android:textColor">@color/m3_button_foreground_color_selector</item>
158162
<item name="iconTint">@color/m3_button_foreground_color_selector</item>
159163
<item name="backgroundTint">@color/m3_button_background_color_selector</item>

0 commit comments

Comments
 (0)