From a6c127670fb3389d0184e8e0bc2d800770db3dd7 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Fri, 7 Jan 2011 10:45:18 -0800
Subject: [PATCH] Fix bug 3158976 - Search box is too small

Set default minimum widths for SearchView text fields.

Fix an issue with the ActionButton style.

Change-Id: I2315df334479ba66fed16e2ca59c4a49e2437442
---
 core/res/res/layout/search_view.xml        |  3 ++-
 core/res/res/values-xlarge-land/dimens.xml | 22 ++++++++++++++++++++++
 core/res/res/values-xlarge/dimens.xml      |  2 ++
 core/res/res/values/styles.xml             |  1 +
 4 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 core/res/res/values-xlarge-land/dimens.xml

diff --git a/core/res/res/layout/search_view.xml b/core/res/res/layout/search_view.xml
index bb7f7006899b8..46d0341d3f41a 100644
--- a/core/res/res/layout/search_view.xml
+++ b/core/res/res/layout/search_view.xml
@@ -45,6 +45,7 @@
         android:layout_gravity="center_vertical"
         android:background="?android:attr/selectableItemBackground"
         android:src="?android:attr/searchViewSearchIcon"
+        style="?android:attr/actionButtonStyle"
     />
 
     <LinearLayout
@@ -79,7 +80,7 @@
                 android:layout_height="36dip"
                 android:layout_width="0dp"
                 android:layout_weight="1"
-                android:minWidth="100dp"
+                android:minWidth="@dimen/search_view_text_min_width"
                 android:layout_gravity="bottom"
                 android:paddingLeft="8dip"
                 android:paddingRight="6dip"
diff --git a/core/res/res/values-xlarge-land/dimens.xml b/core/res/res/values-xlarge-land/dimens.xml
new file mode 100644
index 0000000000000..6a2b93fd0e881
--- /dev/null
+++ b/core/res/res/values-xlarge-land/dimens.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+    <!-- Minimum width of the search view text entry area. -->
+    <dimen name="search_view_text_min_width">256dip</dimen>
+</resources>
diff --git a/core/res/res/values-xlarge/dimens.xml b/core/res/res/values-xlarge/dimens.xml
index 7353f16fd455a..18090ba0f11b2 100644
--- a/core/res/res/values-xlarge/dimens.xml
+++ b/core/res/res/values-xlarge/dimens.xml
@@ -41,4 +41,6 @@
     <!-- The standard size (both width and height) of an application icon that
          will be displayed in the app launcher and elsewhere. -->
     <dimen name="app_icon_size">64dip</dimen>
+    <!-- Minimum width of the search view text entry area. -->
+    <dimen name="search_view_text_min_width">192dip</dimen>
 </resources>
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index ec5ef838bf1a2..2ea013545cf28 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -1033,6 +1033,7 @@
         <item name="android:background">?android:attr/selectableItemBackground</item>
         <item name="android:paddingLeft">16dip</item>
         <item name="android:paddingRight">16dip</item>
+        <item name="android:minWidth">64dip</item>
     </style>
 
     <style name="Widget.ActionButton.Overflow">