From 874697f6e5a3666200cf4266e678bd2ade47aae5 Mon Sep 17 00:00:00 2001
From: Ellen Poe <ellenhp@google.com>
Date: Sat, 30 Mar 2019 19:05:36 -0700
Subject: [PATCH] Added content descriptions for some important controls.

Fixes #8728

Co-authored-by: Alan Evans <alan@signal.org>
---
 res/layout/contact_filter_toolbar.xml     | 3 +++
 res/layout/conversation_list_activity.xml | 1 +
 res/layout/profile_create_activity.xml    | 1 +
 res/values/strings.xml                    | 7 +++++++
 4 files changed, 12 insertions(+)

diff --git a/res/layout/contact_filter_toolbar.xml b/res/layout/contact_filter_toolbar.xml
index 14602a1129..3c7b564d16 100644
--- a/res/layout/contact_filter_toolbar.xml
+++ b/res/layout/contact_filter_toolbar.xml
@@ -33,6 +33,7 @@
                 android:gravity="center">
 
                 <ImageView android:id="@+id/search_dialpad"
+                           android:contentDescription="@string/contact_filter_toolbar__show_dial_pad_description"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_gravity="center_vertical"
@@ -43,6 +44,7 @@
                            android:src="@drawable/ic_dialpad_white_24dp" />
 
                 <ImageView android:id="@+id/search_keyboard"
+                           android:contentDescription="@string/contact_filter_toolbar__show_keyboard_description"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_gravity="center_vertical"
@@ -54,6 +56,7 @@
                            android:src="@drawable/ic_keyboard_white_24dp" />
 
                 <ImageView android:id="@+id/search_clear"
+                           android:contentDescription="@string/contact_filter_toolbar__clear_entered_text_description"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_gravity="center_vertical"
diff --git a/res/layout/conversation_list_activity.xml b/res/layout/conversation_list_activity.xml
index c5c005512c..0c1e04ee12 100644
--- a/res/layout/conversation_list_activity.xml
+++ b/res/layout/conversation_list_activity.xml
@@ -24,6 +24,7 @@
                 android:layout_height="match_parent">
 
             <ImageView android:id="@+id/toolbar_icon"
+                       android:contentDescription="@string/conversation_list_settings_shortcut"
                        android:layout_width="36dp"
                        android:layout_height="36dp"
                        android:layout_marginStart="8dp"
diff --git a/res/layout/profile_create_activity.xml b/res/layout/profile_create_activity.xml
index 4ee8772292..0f849e0c3b 100644
--- a/res/layout/profile_create_activity.xml
+++ b/res/layout/profile_create_activity.xml
@@ -67,6 +67,7 @@
 
                 <ImageView
                     android:id="@+id/avatar"
+                    android:contentDescription="@string/CreateProfileActivity_set_avatar_description"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     app:layout_constraintBottom_toBottomOf="@+id/avatar_background"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3fac2da987..91433721a9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -293,6 +293,7 @@
     <string name="CreateProfileActivity_profile_name">Profile Name</string>
     <string name="CreateProfileActivity_set_up_your_profile">Set up your profile</string>
     <string name="CreateProfileActivity_signal_profiles_are_end_to_end_encrypted">Signal profiles are end-to-end encrypted, and the Signal service never has access to this information.</string>
+    <string name="CreateProfileActivity_set_avatar_description">Set avatar</string>
 
     <!-- CustomDefaultPreference -->
     <string name="CustomDefaultPreference_using_custom">Using custom: %s</string>
@@ -921,6 +922,11 @@
     <!-- contact_selection_activity -->
     <string name="contact_selection_activity__enter_name_or_number">Enter name or number</string>
 
+    <!-- contact_filter_toolbar -->
+    <string name="contact_filter_toolbar__clear_entered_text_description">Clear entered text</string>
+    <string name="contact_filter_toolbar__show_keyboard_description">Show keyboard</string>
+    <string name="contact_filter_toolbar__show_dial_pad_description">Show dialpad</string>
+
     <!-- contact_selection_group_activity -->
     <string name="contact_selection_group_activity__no_contacts">No contacts.</string>
     <string name="contact_selection_group_activity__finding_contacts">Loading contacts&#8230;</string>
@@ -1405,6 +1411,7 @@
     <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Unarchive selected</string>
 
     <!-- conversation_list -->
+    <string name="conversation_list_settings_shortcut">Settings shortcut</string>
 
     <!-- conversation_list_item_view -->
     <string name="conversation_list_item_view__contact_photo_image">Contact Photo Image</string>