summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2014-12-09 00:57:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-09 00:57:02 +0000
commit3c175625cf9a17aaa07c1f56b2a74b666c067cb5 (patch)
tree2861c4f686872c3ab70d2d1c76c83ca9262b9e5d /res
parent006b5ccbf892a96ebc1efeb11266323ecb1843c6 (diff)
parent13359c01662a5f08518455e4cadbb248d0150091 (diff)
am 13359c01: am f85e7df3: am 40e3c80d: Merge "Expand search bar text to vertically fit on small devices." into lmp-mr1-dev
* commit '13359c01662a5f08518455e4cadbb248d0150091': Expand search bar text to vertically fit on small devices.
Diffstat (limited to 'res')
-rw-r--r--res/layout/search_edittext.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/layout/search_edittext.xml b/res/layout/search_edittext.xml
index d952d2de5..93a3c754f 100644
--- a/res/layout/search_edittext.xml
+++ b/res/layout/search_edittext.xml
@@ -42,7 +42,7 @@
<TextView
android:layout_width="wrap_content"
- android:layout_height="@dimen/search_box_icon_size"
+ android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/search_box_collapsed_text_margin_left"
android:textSize="@dimen/search_collapsed_text_size"
android:fontFamily="@string/search_font_family"