Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3a19d3f authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 2b26266a: Merge "Fix bug 3158976 - Search box is too small" into honeycomb

* commit '2b26266a':
  Fix bug 3158976 - Search box is too small
parents e0c1d734 2b26266a
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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"
+22 −0
Original line number Diff line number Diff line
<?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>
+2 −0
Original line number Diff line number Diff line
@@ -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>
+1 −0
Original line number Diff line number Diff line
@@ -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">