From 273fd7bc5840a71cf8445455bc0bb1945e2cfc8d Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Thu, 31 Aug 2017 16:06:59 -0700
Subject: Adjusted layout dimensions in new search UI.

screenshots:
default:    http://screen/qEdB51A3PDn
zero-query: http://screen/qEBDg0auGA8
query:      http://screen/SuLp2GwyvYr
Bug: 64806278
Test: manual
PiperOrigin-RevId: 167205946
Change-Id: I07563fd23801da8d9d2eb95f6d09a079474403eb
---
 .../common/res/layout/search_contact_row.xml         |  5 ++---
 .../searchfragment/common/res/values/dimens.xml      |  2 +-
 .../searchfragment/list/res/layout/header_layout.xml | 20 ++++++++++++++------
 3 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'java/com/android/dialer/searchfragment')

diff --git a/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml b/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml
index dd871af70..407207a83 100644
--- a/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml
+++ b/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml
@@ -36,13 +36,13 @@
       android:layout_height="wrap_content"
       android:layout_toEndOf="@+id/photo"
       android:layout_toStartOf="@+id/call_to_action"
-      android:layout_centerVertical="true">
+      android:layout_centerVertical="true"
+      android:layout_marginStart="8dp">
 
     <TextView
         android:id="@+id/primary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingStart="@dimen/search_text_padding_start"
         android:gravity="center_vertical|start"
         android:fontFamily="sans-serif"
         style="@style/PrimaryText"/>
@@ -51,7 +51,6 @@
         android:id="@+id/secondary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingStart="@dimen/search_text_padding_start"
         android:gravity="center_vertical|start"
         android:fontFamily="sans-serif"
         style="@style/SecondaryText"/>
diff --git a/java/com/android/dialer/searchfragment/common/res/values/dimens.xml b/java/com/android/dialer/searchfragment/common/res/values/dimens.xml
index f6664163c..fabb0309f 100644
--- a/java/com/android/dialer/searchfragment/common/res/values/dimens.xml
+++ b/java/com/android/dialer/searchfragment/common/res/values/dimens.xml
@@ -18,5 +18,5 @@
   <dimen name="search_row_height">56dp</dimen>
   <dimen name="search_photo_padding">8dp</dimen>
   <dimen name="call_to_action_padding">8dp</dimen>
-  <dimen name="search_text_padding_start">16dp</dimen>
+  <dimen name="search_text_padding_start">8dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml b/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml
index eef0dee94..6eb1d2e40 100644
--- a/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml
+++ b/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml
@@ -14,10 +14,18 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/header"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="8dp"
-    android:paddingStart="16dp"
-    style="@style/SecondaryText"/>
+    android:layout_height="48dp"
+    android:layout_marginStart="16dp"
+    android:layout_marginEnd="16dp"
+    android:layout_marginBottom="2dp">
+
+  <TextView
+      android:id="@+id/header"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center_vertical"
+      style="@style/SecondaryText"/>
+</FrameLayout>
-- 
cgit v1.2.3