Skip to content

Commit 43fa5b6

Browse files
kendrickumstattddrchen
kendrickumstattd
authored and
drchen
committed
[Button] Add additional demos to catalog.
PiperOrigin-RevId: 691833993
1 parent 9f801b8 commit 43fa5b6

File tree

2 files changed

+75
-2
lines changed

2 files changed

+75
-2
lines changed

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

Lines changed: 74 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,42 @@
3535
android:paddingBottom="8dp"
3636
android:text="@string/cat_split_button_subheader_filled"
3737
android:textAppearance="?attr/textAppearanceSubtitle1"/>
38+
<com.google.android.material.button.MaterialSplitButton
39+
android:layout_width="wrap_content"
40+
android:layout_height="wrap_content">
41+
<Button
42+
android:layout_width="wrap_content"
43+
android:layout_height="wrap_content"
44+
android:minWidth="@dimen/mtrl_min_touch_target_size"
45+
app:icon="@drawable/ic_edit_vd_theme_24dp"
46+
app:iconPadding="0dp"/>
47+
<Button
48+
style="?attr/materialSplitButtonIconFilledStyle"
49+
android:id="@+id/expand_more_or_less_filled_icon"
50+
android:layout_width="wrap_content"
51+
android:layout_height="wrap_content"
52+
android:contentDescription="@string/cat_split_button_label_chevron"
53+
app:icon="@drawable/m3_split_button_chevron_avd"/>
54+
</com.google.android.material.button.MaterialSplitButton>
3855

39-
<com.google.android.material.button.MaterialSplitButton
56+
<com.google.android.material.button.MaterialSplitButton
57+
android:layout_width="wrap_content"
58+
android:layout_height="wrap_content">
59+
<Button
60+
android:layout_width="wrap_content"
61+
android:layout_height="wrap_content"
62+
android:minWidth="@dimen/mtrl_min_touch_target_size"
63+
android:text="@string/cat_split_button_short_label"/>
64+
<Button
65+
style="?attr/materialSplitButtonIconFilledStyle"
66+
android:id="@+id/expand_more_or_less_filled_label"
67+
android:layout_width="wrap_content"
68+
android:layout_height="wrap_content"
69+
android:contentDescription="@string/cat_split_button_label_chevron"
70+
app:icon="@drawable/m3_split_button_chevron_avd"/>
71+
</com.google.android.material.button.MaterialSplitButton>
72+
73+
<com.google.android.material.button.MaterialSplitButton
4074
android:layout_width="wrap_content"
4175
android:layout_height="wrap_content">
4276
<Button
@@ -61,7 +95,44 @@
6195
android:text="@string/cat_split_button_subheader_filled_tonal"
6296
android:textAppearance="?attr/textAppearanceSubtitle1"/>
6397

64-
<com.google.android.material.button.MaterialSplitButton
98+
<com.google.android.material.button.MaterialSplitButton
99+
android:layout_width="wrap_content"
100+
android:layout_height="wrap_content">
101+
<Button
102+
style="?attr/materialButtonTonalStyle"
103+
android:layout_width="wrap_content"
104+
android:layout_height="wrap_content"
105+
android:minWidth="@dimen/mtrl_min_touch_target_size"
106+
app:icon="@drawable/ic_edit_vd_theme_24dp"
107+
app:iconPadding="0dp"/>
108+
<Button
109+
style="?attr/materialSplitButtonIconFilledTonalStyle"
110+
android:id="@+id/expand_more_or_less_tonal_icon"
111+
android:layout_width="wrap_content"
112+
android:layout_height="wrap_content"
113+
android:contentDescription="@string/cat_split_button_label_chevron"
114+
app:icon="@drawable/m3_split_button_chevron_avd"/>
115+
</com.google.android.material.button.MaterialSplitButton>
116+
117+
<com.google.android.material.button.MaterialSplitButton
118+
android:layout_width="wrap_content"
119+
android:layout_height="wrap_content">
120+
<Button
121+
style="?attr/materialButtonTonalStyle"
122+
android:layout_width="wrap_content"
123+
android:layout_height="wrap_content"
124+
android:minWidth="@dimen/mtrl_min_touch_target_size"
125+
android:text="@string/cat_split_button_short_label"/>
126+
<Button
127+
style="?attr/materialSplitButtonIconFilledTonalStyle"
128+
android:id="@+id/expand_more_or_less_tonal_label"
129+
android:layout_width="wrap_content"
130+
android:layout_height="wrap_content"
131+
android:contentDescription="@string/cat_split_button_label_chevron"
132+
app:icon="@drawable/m3_split_button_chevron_avd"/>
133+
</com.google.android.material.button.MaterialSplitButton>
134+
135+
<com.google.android.material.button.MaterialSplitButton
65136
android:layout_width="wrap_content"
66137
android:layout_height="wrap_content">
67138
<Button
@@ -78,6 +149,7 @@
78149
android:contentDescription="@string/cat_split_button_label_chevron"
79150
app:icon="@drawable/m3_split_button_chevron_avd"/>
80151
</com.google.android.material.button.MaterialSplitButton>
152+
81153
<com.google.android.material.materialswitch.MaterialSwitch
82154
android:id="@+id/switch_enable"
83155
android:paddingTop="16dp"

‎catalog/java/io/material/catalog/button/res/values/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
<string name="cat_button_label_tomatoes">Tomatoes</string>
9595
<string name="cat_button_label_mushrooms">Mushrooms</string>
9696
<string name="cat_split_button_label" translatable="false">Label</string>
97+
<string name="cat_split_button_short_label" translatable="false">No</string>
9798
<string description="A label for an icon-only button [CHAR LIMIT=NONE]"
9899
name="cat_icon_button_label_add_circle">Add icon</string>
99100
<string description="A label for an icon-only button [CHAR LIMIT=NONE]"

0 commit comments

Comments
 (0)