summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2013-04-15 23:00:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-15 23:00:02 +0000
commit7972194528cde392ce2b42779a6d5c2d77e86993 (patch)
tree64f784698e13f4fa93526f5c2a02c5336bb2d238 /res
parentae45db052a5e3e7817a09461558158a6670c013e (diff)
parentb301f3fcff2df310c5457e3097887e2cfcbbba80 (diff)
downloadandroid_packages_apps_Trebuchet-7972194528cde392ce2b42779a6d5c2d77e86993.tar.gz
android_packages_apps_Trebuchet-7972194528cde392ce2b42779a6d5c2d77e86993.tar.bz2
android_packages_apps_Trebuchet-7972194528cde392ce2b42779a6d5c2d77e86993.zip
Merge "Fixing issue with qsb icons not being sized correctly. (Bug 8543618)" into jb-mr2-dev
Diffstat (limited to 'res')
-rw-r--r--res/layout-land/search_bar.xml2
-rw-r--r--res/layout-port/search_bar.xml2
-rw-r--r--res/values/dimens.xml2
3 files changed, 5 insertions, 1 deletions
diff --git a/res/layout-land/search_bar.xml b/res/layout-land/search_bar.xml
index af1670bc8..8cdee942c 100644
--- a/res/layout-land/search_bar.xml
+++ b/res/layout-land/search_bar.xml
@@ -25,6 +25,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
+ android:scaleType="center"
android:src="@drawable/ic_home_search_normal_holo"
android:adjustViewBounds="true"
android:onClick="onClickSearchButton"
@@ -39,6 +40,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
+ android:scaleType="center"
android:src="@drawable/ic_home_voice_search_holo"
android:adjustViewBounds="true"
android:onClick="onClickVoiceButton"
diff --git a/res/layout-port/search_bar.xml b/res/layout-port/search_bar.xml
index 7cf79b8b5..62bdb22fc 100644
--- a/res/layout-port/search_bar.xml
+++ b/res/layout-port/search_bar.xml
@@ -41,6 +41,7 @@
android:id="@+id/search_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
+ android:scaleType="fitStart"
android:src="@drawable/ic_home_search_normal_holo"
android:adjustViewBounds="true" />
</com.android.launcher2.HolographicLinearLayout>
@@ -65,6 +66,7 @@
android:id="@+id/voice_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
+ android:scaleType="fitEnd"
android:src="@drawable/ic_home_voice_search_holo"
android:adjustViewBounds="true" />
</com.android.launcher2.HolographicLinearLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index e82f618d5..3fe53d274 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -56,7 +56,7 @@
<dimen name="app_icon_padding_top">8dp</dimen>
<!-- QSB -->
- <dimen name="toolbar_button_vertical_padding">0dip</dimen>
+ <dimen name="toolbar_button_vertical_padding">4dip</dimen>
<dimen name="toolbar_button_horizontal_padding">12dip</dimen>
<!-- External toolbar icon size (for bounds) -->
<dimen name="toolbar_external_icon_width">36dp</dimen>