From b301f3fcff2df310c5457e3097887e2cfcbbba80 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 12 Apr 2013 12:36:56 -0700
Subject: [PATCH] Fixing issue with qsb icons not being sized correctly. (Bug
 8543618)

Change-Id: I807eaa8323e138c3ad13b6b923a3598c072c0588
---
 res/layout-land/search_bar.xml | 2 ++
 res/layout-port/search_bar.xml | 2 ++
 res/values/dimens.xml          | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/res/layout-land/search_bar.xml b/res/layout-land/search_bar.xml
index af1670bc81..8cdee942c0 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 7cf79b8b59..62bdb22fc1 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 e82f618d5b..3fe53d274a 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>