AI 143746: Fix search widget assets to not overlap in landscape mode.
  Done by using small button framework assets, but with manual padding adjustments to bring back to original button size.
  BUG=1749120

Automated import of CL 143746
diff --git a/res/layout/widget_search.xml b/res/layout/widget_search.xml
index b4c455c..f87d30f 100644
--- a/res/layout/widget_search.xml
+++ b/res/layout/widget_search.xml
@@ -45,17 +45,19 @@
         />
         
      <ImageButton android:id="@+id/search_go_btn"
-         android:layout_marginLeft="4dip"
+         android:layout_marginLeft="5dip"
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
          android:src="@*android:drawable/ic_btn_search"
+         style="@style/SearchButton"
          />
     
      <ImageButton android:id="@+id/search_voice_btn"
-         android:layout_marginLeft="2dip"
+         android:layout_marginLeft="4dip"
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
          android:src="@android:drawable/ic_btn_speak_now"
+         style="@style/SearchButton"
          />
 
 </com.android.launcher.Search>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a3d3e22..9b06d26 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -53,4 +53,11 @@
         <item name="android:layout_marginLeft">10dip</item>
         <item name="android:layout_marginRight">10dip</item>
     </style>
+
+    <style name="SearchButton" parent="@android:style/Widget.Button.Small">
+        <item name="android:paddingTop">7dip</item>
+        <item name="android:paddingBottom">9dip</item>
+        <item name="android:paddingLeft">10dip</item>
+        <item name="android:paddingRight">10dip</item>
+    </style>
 </resources>