From 5f8afe6280eae34620067696173e71943e1a30a3 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 12 Aug 2013 16:19:28 -0700
Subject: Initial Changes for Dynamic Grid

Change-Id: I9e6f1e5167791cf8dc140778dfa447f86424e9bf
---
 res/layout-port/search_bar.xml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'res/layout-port/search_bar.xml')

diff --git a/res/layout-port/search_bar.xml b/res/layout-port/search_bar.xml
index 1e12e9eb8..69dd61aa2 100644
--- a/res/layout-port/search_bar.xml
+++ b/res/layout-port/search_bar.xml
@@ -17,9 +17,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
     style="@style/SearchDropTargetBar"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/search_bar_height"
-    android:layout_gravity="bottom|center_horizontal"
     android:background="@drawable/search_frame">
    <!-- Global search icon -->
    <com.android.launcher3.HolographicLinearLayout
@@ -29,8 +26,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
+        android:layout_centerVertical="true"
         android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
         android:layout_toStartOf="@+id/voice_button_container"
         android:paddingStart="8dp"
         android:onClick="onClickSearchButton"
@@ -41,7 +38,8 @@
             android:id="@+id/search_button"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:scaleType="fitStart"
+            android:layout_gravity="start"
+            android:scaleType="fitCenter"
             android:src="@drawable/ic_home_search_normal_holo"
             android:adjustViewBounds="true" />
     </com.android.launcher3.HolographicLinearLayout>
@@ -51,22 +49,22 @@
         style="@style/SearchButton"
         launcher:sourceImageViewId="@+id/voice_button"
         android:id="@+id/voice_button_container"
-        android:layout_width="@dimen/search_bar_height"
+        android:layout_width="@dimen/app_icon_size"
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
+        android:layout_centerVertical="true"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentTop="true"
         android:paddingEnd="8dp"
-        android:gravity="end"
         android:onClick="onClickVoiceButton"
         android:focusable="true"
         android:clickable="true"
         android:contentDescription="@string/accessibility_voice_search_button">
         <ImageView
             android:id="@+id/voice_button"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:scaleType="fitEnd"
+            android:layout_gravity="end"
+            android:scaleType="fitCenter"
             android:src="@drawable/ic_home_voice_search_holo"
             android:adjustViewBounds="true" />
     </com.android.launcher3.HolographicLinearLayout>
-- 
cgit v1.2.3