Skip to content

Commit 11173a4

Browse files
afohrmanhunterstich
authored andcommitted
[FloatingToolbar] Added content descriptions for floating toolbar icon buttons.
PiperOrigin-RevId: 697725732
1 parent 0a5f347 commit 11173a4

File tree

2 files changed

+25
-0
lines changed

2 files changed

+25
-0
lines changed

catalog/java/io/material/catalog/floatingtoolbar/res/layout/cat_floating_toolbar_content.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,36 @@
2121
android:layout_width="wrap_content"
2222
android:layout_height="wrap_content"
2323
android:checkable="true"
24+
android:contentDescription="@string/cat_floating_toolbar_button_bold_content_description"
2425
app:icon="@drawable/ic_format_bold_24px" />
2526
<Button
2627
android:id="@+id/floating_toolbar_button_italic"
2728
style="?attr/materialIconButtonStyle"
2829
android:layout_width="wrap_content"
2930
android:layout_height="wrap_content"
3031
android:checkable="true"
32+
android:contentDescription="@string/cat_floating_toolbar_button_italic_content_description"
3133
app:icon="@drawable/ic_format_italic_24px" />
3234
<Button
3335
android:id="@+id/floating_toolbar_button_underlined"
3436
style="?attr/materialIconButtonStyle"
3537
android:layout_width="wrap_content"
3638
android:layout_height="wrap_content"
3739
android:checkable="true"
40+
android:contentDescription="@string/cat_floating_toolbar_button_underlined_content_description"
3841
app:icon="@drawable/ic_format_underlined_24px" />
3942
<Button
4043
android:id="@+id/floating_toolbar_button_color_text"
4144
style="?attr/materialIconButtonStyle"
4245
android:layout_width="wrap_content"
4346
android:layout_height="wrap_content"
47+
android:contentDescription="@string/cat_floating_toolbar_button_color_text_content_description"
4448
app:icon="@drawable/ic_format_color_text_24px" />
4549
<Button
4650
android:id="@+id/floating_toolbar_button_color_fill"
4751
style="?attr/materialIconButtonStyle"
4852
android:layout_width="wrap_content"
4953
android:layout_height="wrap_content"
54+
android:contentDescription="@string/cat_floating_toolbar_button_color_fill_content_description"
5055
app:icon="@drawable/ic_format_color_fill_24px" />
5156
</merge>

catalog/java/io/material/catalog/floatingtoolbar/res/values/strings.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,26 @@
3939
description="Text for a button that sets the Floating Toolbar to right orientation [CHAR LIMIT=NONE]">
4040
Right
4141
</string>
42+
<string name="cat_floating_toolbar_button_bold_content_description"
43+
description="Content description for a button that bolds the body text [CHAR LIMIT=NONE]">
44+
Format text bold
45+
</string>
46+
<string name="cat_floating_toolbar_button_italic_content_description"
47+
description="Content description for a button that italicizes the body text [CHAR LIMIT=NONE]">
48+
Format text italic
49+
</string>
50+
<string name="cat_floating_toolbar_button_underlined_content_description"
51+
description="Content description for a button that underlines the body text [CHAR LIMIT=NONE]">
52+
Format text underlined
53+
</string>
54+
<string name="cat_floating_toolbar_button_color_text_content_description"
55+
description="Content description for a button that sets the body text to a new random color [CHAR LIMIT=NONE]">
56+
Format text color
57+
</string>
58+
<string name="cat_floating_toolbar_button_color_fill_content_description"
59+
description="Content description for a button that sets the body text background to a new random color [CHAR LIMIT=NONE]">
60+
Format text background color
61+
</string>
4262
<string name="cat_floating_toolbar_filler_text" translatable="false">
4363
\t\tLorem ipsum dolor sit amet, consectetur adipiscing elit. Nam in scelerisque sem. Mauris volutpat, dolor id interdum ullamcorper, risus dolor egestas lectus, sit amet mattis purus dui nec risus. Maecenas non sodales nisi, vel dictum dolor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Suspendisse blandit eleifend diam, vel rutrum tellus vulputate quis. Aliquam eget libero aliquet, imperdiet nisl a, ornare ex. Sed rhoncus est ut libero porta lobortis. Fusce in dictum tellus.
4464
\n\n\t\tSuspendisse interdum ornare ante. Aliquam nec cursus lorem. Morbi id magna felis. Vivamus egestas, est a condimentum egestas, turpis nisl iaculis ipsum, in dictum tellus dolor sed neque. Morbi tellus erat, dapibus ut sem a, iaculis tincidunt dui. Interdum et malesuada fames ac ante ipsum primis in faucibus. Curabitur et eros porttitor, ultricies urna vitae, molestie nibh. Phasellus at commodo eros, non aliquet metus. Sed maximus nisl nec dolor bibendum, vel congue leo egestas.

0 commit comments

Comments
 (0)