Restore search UI layout to get search button back

This reverts commit aa0cfa7b6bf8000c59ceca2f9b698103e553d402.

Change-Id: Ia58b6ac4778c1c376db144f6c5bde22adbc41c10

6 files changed, 8 insertions, 12 deletions

diff --git a/core/res/res/drawable-hdpi/search_plate_global.9.png b/core/res/res/drawable-hdpi/search_plate_global.9.png
index e9f4f12..32c6dc3 100644
--- a/core/res/res/drawable-hdpi/search_plate_global.9.png
+++ b/core/res/res/drawable-hdpi/search_plate_global.9.png
diff --git a/core/res/res/drawable-hdpi/search_source_selector_indicator.png b/core/res/res/drawable-hdpi/search_source_selector_indicator.png
index e81d9ac..b93a0c0 100644
--- a/core/res/res/drawable-hdpi/search_source_selector_indicator.png
+++ b/core/res/res/drawable-hdpi/search_source_selector_indicator.png
diff --git a/core/res/res/drawable-mdpi/search_plate_global.9.png b/core/res/res/drawable-mdpi/search_plate_global.9.png
index bb7400e..1cad902 100644
--- a/core/res/res/drawable-mdpi/search_plate_global.9.png
+++ b/core/res/res/drawable-mdpi/search_plate_global.9.png
diff --git a/core/res/res/drawable-mdpi/search_source_selector_indicator.png b/core/res/res/drawable-mdpi/search_source_selector_indicator.png
index b3efef2..26bf18a 100644
--- a/core/res/res/drawable-mdpi/search_source_selector_indicator.png
+++ b/core/res/res/drawable-mdpi/search_source_selector_indicator.png
diff --git a/core/res/res/layout/search_bar.xml b/core/res/res/layout/search_bar.xml
index 2e93a39..12285fd 100644
--- a/core/res/res/layout/search_bar.xml
+++ b/core/res/res/layout/search_bar.xml
@@ -33,9 +33,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingLeft="4dip"
-        android:paddingRight="4dip"
-        android:paddingTop="4dip"
+        android:paddingLeft="12dip"
+        android:paddingRight="12dip"
+        android:paddingTop="7dip"
+        android:paddingBottom="16dip"
         android:background="@drawable/search_plate_global" >
 
         <!-- This is actually used for the badge icon *or* the badge label (or neither) -->
@@ -62,11 +63,10 @@
 
             <view class="android.app.SearchDialog$SearchAutoComplete"
                 android:id="@+id/search_src_text"
-                android:background="@drawable/edit_text"
+                android:background="@drawable/textfield_search"
                 android:layout_height="wrap_content"
                 android:layout_width="0dip"
                 android:layout_weight="1.0"
-                android:layout_marginLeft="4dip"
                 android:paddingLeft="8dip"
                 android:paddingRight="6dip"
                 android:drawablePadding="2dip"
@@ -86,15 +86,13 @@
                 android:background="@drawable/btn_search_dialog"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:visibility="gone"
             />
 
             <ImageButton
                 android:id="@+id/search_voice_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="4dip"
-                android:layout_marginBottom="4dip"
+                android:layout_marginLeft="8dip"
                 android:background="@drawable/btn_search_dialog_voice"
                 android:src="@android:drawable/ic_btn_speak_now"
             />
diff --git a/core/res/res/layout/search_source_selector.xml b/core/res/res/layout/search_source_selector.xml
index 9312b08..c69dfc0 100644
--- a/core/res/res/layout/search_source_selector.xml
+++ b/core/res/res/layout/search_source_selector.xml
@@ -16,11 +16,10 @@
 
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="42dip"
+    android:layout_width="48dip"
     android:layout_height="match_parent"
-    android:layout_marginBottom="2dip"
     android:foreground="@drawable/search_source_selector_indicator"
-    android:foregroundGravity="bottom|center_horizontal"
+    android:foregroundGravity="bottom|right"
     >
 
     <ImageButton
@@ -28,7 +27,6 @@
         android:background="@drawable/search_source_selector_background"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="6dip"
         android:scaleType="centerInside"
         android:focusable="true"
         android:clickable="true"