Add missing contentDescription to focusable controls.

7 files changed, 53 insertions, 0 deletions

diff --git a/res/layout-finger/edit_contact.xml b/res/layout-finger/edit_contact.xml
index cf0537b79..d343318e8 100644
--- a/res/layout-finger/edit_contact.xml
+++ b/res/layout-finger/edit_contact.xml
@@ -56,6 +56,7 @@
                         android:src="@drawable/ic_menu_add_picture"
                         android:scaleType="center"
                         android:background="@drawable/btn_contact_picture"
+                        android:contentDescription="@string/description_contact_photo"
                     />
                 </FrameLayout>
 
diff --git a/res/layout-finger/twelve_key_dialer.xml b/res/layout-finger/twelve_key_dialer.xml
index b1dce245f..d4c9d8f4c 100644
--- a/res/layout-finger/twelve_key_dialer.xml
+++ b/res/layout-finger/twelve_key_dialer.xml
@@ -40,6 +40,7 @@
         android:editable="true"
         android:cursorVisible="false"
         android:layout_weight="0"
+        android:contentDescription="@string/description_digits_edittext"
     />
 
     <!-- Keypad section -->
diff --git a/res/layout-finger/voicemail_dial_delete.xml b/res/layout-finger/voicemail_dial_delete.xml
index 910aafff0..384981c76 100644
--- a/res/layout-finger/voicemail_dial_delete.xml
+++ b/res/layout-finger/voicemail_dial_delete.xml
@@ -34,6 +34,7 @@
         android:layout_gravity="center_vertical"
         android:state_enabled="false"
         android:background="@drawable/btn_dial_voicemail"
+        android:contentDescription="@string/description_voicemail_button"
         android:src="@drawable/ic_dial_action_voice_mail" />
 
     <!-- Onscreen "Dial" button, used on all platforms by
@@ -45,6 +46,7 @@
         android:layout_gravity="center_vertical"
         android:state_enabled="false"
         android:background="@drawable/btn_dial_action"
+        android:contentDescription="@string/description_dial_button"
         android:src="@drawable/ic_dial_action_call" />
 
     <!-- Onscreen "Backspace/Delete" button
@@ -57,6 +59,7 @@
         android:layout_gravity="center_vertical"
         android:state_enabled="false"
         android:background="@drawable/btn_dial_delete"
+        android:contentDescription="@string/description_delete_button"
         android:src="@drawable/ic_dial_action_delete" />
 </LinearLayout>
 
diff --git a/res/layout-long-finger/voicemail_dial_delete.xml b/res/layout-long-finger/voicemail_dial_delete.xml
index 8c42e654e..23ff28931 100644
--- a/res/layout-long-finger/voicemail_dial_delete.xml
+++ b/res/layout-long-finger/voicemail_dial_delete.xml
@@ -35,6 +35,7 @@
         android:layout_gravity="center_vertical"
         android:state_enabled="false"
         android:background="@drawable/btn_dial_voicemail"
+        android:contentDescription="@string/description_voicemail_button"
         android:src="@drawable/ic_dial_action_voice_mail" />
 
     <!-- Onscreen "Dial" button, used on all platforms by
@@ -46,6 +47,7 @@
         android:layout_gravity="center_vertical"
         android:state_enabled="false"
         android:background="@drawable/btn_dial_action"
+        android:contentDescription="@string/description_dial_button"
         android:src="@drawable/ic_dial_action_call" />
 
     <!-- Onscreen "Backspace/Delete" button
@@ -58,6 +60,7 @@
         android:layout_gravity="center_vertical"
         android:state_enabled="false"
         android:background="@drawable/btn_dial_delete"
+        android:contentDescription="@string/description_delete_button"
         android:src="@drawable/ic_dial_action_delete" />
 </LinearLayout>
 
diff --git a/res/layout/item_photo_editor.xml b/res/layout/item_photo_editor.xml
index 7544439c8..b981131b6 100644
--- a/res/layout/item_photo_editor.xml
+++ b/res/layout/item_photo_editor.xml
@@ -24,4 +24,5 @@
     android:cropToPadding="true"
     android:scaleType="center"
     android:background="@drawable/btn_contact_picture"
+    android:contentDescription="@string/description_contact_photo"
     android:gravity="center" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9755c0e54..7990406c7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -776,6 +776,48 @@
     -->
     <string name="description_image_button_pound">pound</string>
 
+    <!-- String describing the Voicemail ImageButton
+
+         Used by AccessibilityService to announce the purpose of the button.
+    -->
+    <string name="description_voicemail_button">voicemail</string>
+
+    <!-- String describing the Dial ImageButton
+
+         Used by AccessibilityService to announce the purpose of the button.
+    -->
+    <string name="description_dial_button">dial</string>
+
+    <!-- String describing the Delete/Backspace ImageButton
+
+         Used by AccessibilityService to announce the purpose of the button.
+    -->
+    <string name="description_delete_button">backspace</string>
+
+    <!-- String describing the digits text box containing the number to dial.
+
+         Used by AccessibilityService to announce the purpose of the view.
+    -->
+    <string name="description_digits_edittext">number to dial</string>
+
+    <!-- String describing the Contact Photo Image
+
+         Used by AccessibilityService to announce the purpose of the view.
+    -->
+    <string name="description_contact_photo">contact photo</string>
+
+    <!-- String describing the Contact Editor Minus button
+
+         Used by AccessibilityService to announce the purpose of the button.
+    -->
+    <string name="description_minus_button">minus</string>
+
+    <!-- String describing the Contact Editor Plus button
+
+         Used by AccessibilityService to announce the purpose of the button.
+    -->
+    <string name="description_plus_button">plus</string>
+
     <!-- Dialog title shown when SD Card does not exist -->
     <string name="no_sdcard_title">No SD card</string>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a73144376..0a6fe2fbc 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -23,11 +23,13 @@
     <style name="MinusButton">
         <item name="android:background">@drawable/btn_circle</item>
         <item name="android:src">@drawable/ic_btn_round_minus</item>
+        <item name="android:contentDescription">@string/description_minus_button</item>
     </style>
 
     <style name="PlusButton">
         <item name="android:background">@drawable/btn_circle</item>
         <item name="android:src">@drawable/ic_btn_round_plus</item>
+        <item name="android:contentDescription">@string/description_plus_button</item>
     </style>
 
     <style name="MoreButton">