summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Amith Yamasani <yamasani@google.com> 2011-08-16 10:40:02 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-08-16 10:40:02 -0700
commit055cf36319e59488842a003a4c25085556ee00c0 (patch)
tree5e8c22ad9a92ba48994f69f74ae7698fc64df8b5
parent8e99d183345391cddec70e18d3c41cf21f9f67cb (diff)
parent616365e04cb2ef47d4b3183d3b74c4c63bc2f35c (diff)
Merge "Accessibility strings for search view components."
-rw-r--r--core/res/res/layout/search_view.xml5
-rwxr-xr-xcore/res/res/values/strings.xml10
2 files changed, 15 insertions, 0 deletions
diff --git a/core/res/res/layout/search_view.xml b/core/res/res/layout/search_view.xml
index 6b70d8dc42f7..03e870611f0f 100644
--- a/core/res/res/layout/search_view.xml
+++ b/core/res/res/layout/search_view.xml
@@ -48,6 +48,7 @@
android:background="?android:attr/selectableItemBackground"
android:src="?android:attr/searchViewSearchIcon"
style="?android:attr/actionButtonStyle"
+ android:contentDescription="@string/searchview_description_search"
/>
<LinearLayout
@@ -99,6 +100,7 @@
android:dropDownAnchor="@id/search_edit_frame"
android:dropDownVerticalOffset="0dip"
android:dropDownHorizontalOffset="0dip"
+ android:contentDescription="@string/searchview_description_query"
/>
<ImageView
@@ -111,6 +113,7 @@
android:background="?android:attr/selectableItemBackground"
android:src="?android:attr/searchViewCloseIcon"
android:focusable="true"
+ android:contentDescription="@string/searchview_description_clear"
/>
</LinearLayout>
@@ -133,6 +136,7 @@
android:src="?android:attr/searchViewGoIcon"
android:visibility="gone"
android:focusable="true"
+ android:contentDescription="@string/searchview_description_submit"
/>
<ImageView
@@ -146,6 +150,7 @@
android:background="?android:attr/selectableItemBackground"
android:visibility="gone"
android:focusable="true"
+ android:contentDescription="@string/searchview_description_voice"
/>
</LinearLayout>
</LinearLayout>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index c70e3d28edab..feb78462dadb 100755
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -2228,6 +2228,16 @@
<!-- This is the default button label in the system-wide search UI.
It is also used by the home screen's search "widget". It should be short -->
<string name="search_go">Search</string>
+ <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
+ <string name="searchview_description_search">Search</string>
+ <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
+ <string name="searchview_description_query">Search query</string>
+ <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
+ <string name="searchview_description_clear">Clear query</string>
+ <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
+ <string name="searchview_description_submit">Submit query</string>
+ <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
+ <string name="searchview_description_voice">Voice search</string>
<!-- String used to display the date. This is the string to say something happened 1 month ago. -->
<string name="oneMonthDurationPast">1 month ago</string>