From 920280b4d15ab00bf9eb10c8991bbf0aee424305 Mon Sep 17 00:00:00 2001
From: Mihai Nita <mnita@google.com>
Date: Wed, 3 Feb 2016 21:33:37 -0800
Subject: [PATCH] Fixing language search box size and maximization

The search box for the language was entering full screen in
landscape mode, making the search results invisible.
It was also "shifted" to the right, leaving a few characters from
the title visible (ugly), and making the edit area smaller.

This change fixes that behavior, and because we have more space
we can also increase the character limit for the hint string.

Bug: 26944452
Bug: 26944321
Bug: 26957818
Bug: 26732587
Change-Id: Ib5901bd7240ac57b6d39cb4392edccc8d941802d
---
 core/res/res/menu/language_selection_list.xml | 8 ++++----
 core/res/res/values/strings.xml               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/res/res/menu/language_selection_list.xml b/core/res/res/menu/language_selection_list.xml
index 63b962740e75..377c4fab962a 100644
--- a/core/res/res/menu/language_selection_list.xml
+++ b/core/res/res/menu/language_selection_list.xml
@@ -14,12 +14,12 @@
      limitations under the License.
 -->
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/locale_search_menu"
         android:title="@string/locale_search_menu"
-        app:showAsAction="always"
-        app:actionViewClass="android.widget.SearchView" />
+        android:icon="@*android:drawable/ic_search_api_material"
+        android:showAsAction="always|collapseActionView"
+        android:actionViewClass="android.widget.SearchView" />
 
 </menu>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 523826bf79ec..1aa58b7d4169 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -4168,7 +4168,7 @@
     <string name="language_selection_title">Language preference</string>
     <!-- Title for the region selection screen [CHAR LIMIT=25] -->
     <string name="country_selection_title">Region preference</string>
-    <!-- Hint text in a search edit box (used to filter long language / country lists) [CHAR LIMIT=20] -->
+    <!-- Hint text in a search edit box (used to filter long language / country lists) [CHAR LIMIT=25] -->
     <string name="search_language_hint">Type language name</string>
 
     <!-- List section subheader for the language picker, containing a list of suggested languages determined by the default region [CHAR LIMIT=30] -->
-- 
2.11.0