Merge "Search accessibility and keyboard nav" into ub-gmail-ur14-dev
diff --git a/res/layout-sw600dp/mail_toolbar_view.xml b/res/layout-sw600dp/mail_toolbar_view.xml
index b453a24..f014999 100644
--- a/res/layout-sw600dp/mail_toolbar_view.xml
+++ b/res/layout-sw600dp/mail_toolbar_view.xml
@@ -46,6 +46,7 @@
android:layout_width="56dp"
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackground"
+ android:contentDescription="@string/menu_search"
android:scaleType="center"
android:src="@drawable/ic_menu_search" />
diff --git a/res/layout/mail_actionbar_searchview.xml b/res/layout/mail_actionbar_searchview.xml
index f142d27..62164a8 100644
--- a/res/layout/mail_actionbar_searchview.xml
+++ b/res/layout/mail_actionbar_searchview.xml
@@ -45,6 +45,7 @@
android:hint="@string/search_hint"
android:imeOptions="actionSearch|flagNoExtractUi"
android:inputType="text|textNoSuggestions"
+ android:nextFocusDown="@+id/search_overlay_suggestion_list"
android:paddingLeft="@dimen/search_main_text_padding"
android:paddingRight="@dimen/search_main_text_padding"
android:singleLine="true"
diff --git a/res/layout/search_suggestion_list.xml b/res/layout/search_suggestion_list.xml
index 8bfebf5..3f4bed0 100644
--- a/res/layout/search_suggestion_list.xml
+++ b/res/layout/search_suggestion_list.xml
@@ -29,7 +29,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
- android:divider="@null" />
+ android:divider="@null"
+ android:nextFocusUp="@+id/search_actionbar_query_text" />
<!-- Scrim to fade the background -->
<View
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d412e5e..0cf62c3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -427,6 +427,8 @@
<string name="search_results_header">Results</string>
<!-- Toast shown when the user taps the search hard key when viewing an account that does not support search [CHAR LIMIT=100] -->
<string name="search_unsupported">Search is not supported on this account.</string>
+ <!-- Accessibility description for the search suggestion item [CHAR LIMIT=100] -->
+ <string name="search_suggestion_desc">Suggestion: <xliff:g id="suggestion">%s</xliff:g></string>
<!-- Conversation view -->
<!-- Text anchor for control to add / change labels on a conversation when
diff --git a/src/com/android/mail/ui/MaterialSearchSuggestionsList.java b/src/com/android/mail/ui/MaterialSearchSuggestionsList.java
index 88c7943..e40d42f 100644
--- a/src/com/android/mail/ui/MaterialSearchSuggestionsList.java
+++ b/src/com/android/mail/ui/MaterialSearchSuggestionsList.java
@@ -207,8 +207,11 @@
}
final SuggestionItem item = mSuggestions.get(position);
- ((TextView) convertView.findViewById(R.id.search_overlay_item_text))
- .setText(item.suggestion);
+ final TextView text =
+ (TextView) convertView.findViewById(R.id.search_overlay_item_text);
+ text.setText(item.suggestion);
+ text.setContentDescription(getResources().getString(R.string.search_suggestion_desc,
+ item.suggestion));
((ImageView) convertView.findViewById(R.id.search_overlay_item_icon))
.setImageURI(item.icon);