From 07cd38746fb6b30072aa36d23c907edc9690eecd Mon Sep 17 00:00:00 2001
From: Alan Newberger <alann@google.com>
Date: Mon, 3 Feb 2014 17:23:50 -0800
Subject: [PATCH] add content descriptions for filmstrip controls

adding TalkBack descriptions for action buttons shown on the bottom of filmstrip.

Bug: 10745077
Change-Id: I3ea278fb065629b43f0ccc9821fe19e6f1d9c4f9
---
 res/layout/filmstrip_bottom_controls.xml | 12 ++++++++----
 res/values/strings.xml                   |  8 ++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/res/layout/filmstrip_bottom_controls.xml b/res/layout/filmstrip_bottom_controls.xml
index 609d43a8a..b7277f4e7 100644
--- a/res/layout/filmstrip_bottom_controls.xml
+++ b/res/layout/filmstrip_bottom_controls.xml
@@ -36,7 +36,8 @@
         android:id="@+id/filmstrip_bottom_control_share"
         style="@style/FilmstripBottomControlButton"
         android:src="@drawable/ic_menu_share_holo_light"
-        android:visibility="invisible" />
+        android:visibility="invisible"
+        android:contentDescription="@string/share_button_description" />
 
     <LinearLayout
         android:layout_width="144dp"
@@ -55,7 +56,8 @@
             style="@style/FilmstripBottomControlButton"
             android:layout_gravity="center"
             android:src="@drawable/ic_view_photosphere"
-            android:visibility="gone" />
+            android:visibility="gone"
+            android:contentDescription="@string/view_button_description" />
 
         <View
             android:id="@+id/filmstrip_bottom_control_middle_filler"
@@ -68,7 +70,8 @@
             android:id="@+id/filmstrip_bottom_control_edit"
             style="@style/FilmstripBottomControlButton"
             android:src="@drawable/ic_menu_edit_holo_dark"
-            android:visibility="gone" />
+            android:visibility="gone"
+            android:contentDescription="@string/edit_button_description" />
 
         <View
             android:layout_width="0dp"
@@ -82,7 +85,8 @@
         android:id="@+id/filmstrip_bottom_control_delete"
         style="@style/FilmstripBottomControlButton"
         android:src="@drawable/ic_menu_trash_holo_light"
-        android:visibility="invisible" />
+        android:visibility="invisible"
+        android:contentDescription="@string/delete_button_description" />
 
     <!-- A filler view -->
     <View
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a1b8c1dfe..924d35d86 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -739,6 +739,14 @@ CHAR LIMIT=NONE] -->
     <!-- Accessibility text for retake button [CHAR_LIMIT=NONE] -->
     <string name="retake_button_description">Retake</string>
 
+    <!-- Accessibility text for filmstrip share button [CHAR_LIMIT=NONE] -->
+    <string name="share_button_description">Share</string>
+    <!-- Accessibility text for filmstrip view button used to open special image viewers, like 3d photosphere [CHAR_LIMIT=NONE] -->
+    <string name="view_button_description">View</string>
+    <!-- Accessibility text for filmstrip edit button [CHAR_LIMIT=NONE] -->
+    <string name="edit_button_description">Edit</string>
+    <!-- Accessibility text for filmstrip delete button [CHAR_LIMIT=NONE] -->
+    <string name="delete_button_description">Delete</string>
 
     <!-- Text shown in camera settings list for toggling photo location on or off [CHAR LIMIT=25] -->
     <string name="setting_location">Location</string>
-- 
2.11.0