commit 20ac28bacc93418f36563a563dc6a44cf014e840
author Winson Chung <winsonc@google.com> Wed Apr 13 15:09:01 2011 -0700
committer Winson Chung <winsonc@google.com> Thu Apr 14 13:07:45 2011 -0700
tree b00b29560bf5da815e2fe2027e3757ab8275a3af
parent 49f3c8e34bfa42de60bb38f64024747d6d944bda

Adding content descriptions for items in the button bar.

Change-Id: Ibf140f80e0499777f5671cb306ead429888792ba

res/layout-xlarge/button_bar.xml

diff --git a/res/layout-xlarge/button_bar.xml b/res/layout-xlarge/button_bar.xml
index 618f4e5..62115f7 100644
--- a/res/layout-xlarge/button_bar.xml
+++ b/res/layout-xlarge/button_bar.xml
@@ -34,7 +34,8 @@
         android:onClick="onClickSearchButton"
 
         android:focusable="true"
-        android:clickable="true" />
+        android:clickable="true"
+        android:contentDescription="@string/accessibility_search_button" />
 
     <ImageView
         android:id="@+id/search_divider"
@@ -64,7 +65,8 @@
         android:onClick="onClickVoiceButton"
 
         android:focusable="true"
-        android:clickable="true"/>
+        android:clickable="true"
+        android:contentDescription="@string/accessibility_voice_search_button" />
 
     <!-- AllApps icon -->
     <com.android.launcher2.StrokedTextView
@@ -79,7 +81,7 @@
         android:paddingRight="@dimen/toolbar_button_horizontal_padding"
         android:paddingTop="@dimen/all_apps_button_vertical_padding"
         android:paddingBottom="@dimen/all_apps_button_vertical_padding"
-       android:background="@drawable/button_bg"
+        android:background="@drawable/button_bg"
 
         android:gravity="center_horizontal|center_vertical"
         android:textColor="#CCFFFFFF"
@@ -95,7 +97,8 @@
         android:shadowRadius="2.5"
 
         android:focusable="true"
-        android:clickable="true" />
+        android:clickable="true"
+        android:contentDescription="@string/accessibility_all_apps_button" />
 
     <ImageView
         android:id="@+id/all_apps_divider"
@@ -123,7 +126,7 @@
         android:paddingBottom="@dimen/toolbar_button_vertical_padding"
         android:background="@drawable/button_bg"
         android:focusable="true"
- />
+        android:contentDescription="@string/accessibility_customize_button" />
 
     <!-- Delete icon -->
     <com.android.launcher2.DeleteZone
@@ -152,5 +155,5 @@
         launcher:direction="horizontal"
 
         android:focusable="true"
- />
+        android:contentDescription="@string/accessibility_delete_button" />
 </RelativeLayout>

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index eedbd6a..9ad3e24 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -151,6 +151,17 @@
          device. [CHAR_LIMIT=30]-->
     <string name="delete_zone_label_all_apps">Uninstall</string>
 
+    <!-- Accessibility: Search button -->
+    <string name="accessibility_search_button">Search</string>
+    <!-- Accessibility: Voice Search button -->
+    <string name="accessibility_voice_search_button">Voice Search</string>
+    <!-- Accessibility: AllApps button -->
+    <string name="accessibility_all_apps_button">Applications</string>
+    <!-- Accessibility: Customize button -->
+    <string name="accessibility_customize_button">Customize</string>
+    <!-- Accessibility: Delete button -->
+    <string name="accessibility_delete_button">Remove</string>
+
     <!-- Label for trash icon in All Apps, when an updated system app is selected. The update will
          be uninstalled. [CHAR_LIMIT=30] -->
     <string name="delete_zone_label_all_apps_system_app">Uninstall update</string>