From 101c1d09e1b2dc72038900775a11b46f34b63abd Mon Sep 17 00:00:00 2001
From: Sundeep Ghuman <sghuman@google.com>
Date: Mon, 12 Mar 2018 20:28:09 -0700
Subject: [PATCH] Fix new DataUsageSummary page line spacing.

There are still some unspecified items pending UX. Have left comments on
ag/3702541 to avoid regressions.

Bug: 70950124
Test: UI change only, no code to test.
Change-Id: I7fa96134af750d71786d031652162aed6bffbeb5
---
 res/layout/data_usage_summary_preference.xml | 25 ++++++++------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/res/layout/data_usage_summary_preference.xml b/res/layout/data_usage_summary_preference.xml
index 445e7cdd468..c2cb8413b9d 100644
--- a/res/layout/data_usage_summary_preference.xml
+++ b/res/layout/data_usage_summary_preference.xml
@@ -18,6 +18,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingTop="24dp"
+    android:paddingBottom="32dp"
     android:paddingStart="@dimen/preference_no_icon_padding_start"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:orientation="vertical"
@@ -31,26 +33,18 @@
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceListItemSecondary"
         android:textColor="?android:attr/textColorSecondary"
-        android:paddingBottom="5dp"
         android:text="@string/data_usage_title" />
 
     <TextView
         android:id="@android:id/title"
+        android:paddingTop="12dp"
+        android:paddingBottom="4dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="5dp"
         android:fontFamily="@*android:string/config_headlineFontFamily"
         android:textColor="?android:attr/colorAccent"
         android:textAppearance="@android:style/TextAppearance.Material.Large" />
 
-    <TextView
-        android:id="@android:id/summary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-        android:textColor="?android:attr/textColorSecondary"
-        android:paddingBottom="5dp" />
-
     <com.android.settings.widget.LinearColorBar
         android:id="@+id/color_bar"
         android:layout_width="match_parent"
@@ -60,7 +54,8 @@
         android:id="@+id/label_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="2dp"
+        android:paddingTop="4dp"
+        android:paddingBottom="8dp"
         android:orientation="horizontal">
 
         <TextView android:id="@android:id/text1"
@@ -84,18 +79,18 @@
 
     <TextView
         android:id="@+id/cycle_left_time"
+        android:paddingTop="4dp"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="5dp" />
+        android:layout_height="wrap_content" />
 
     <TextView
         android:id="@+id/carrier_and_update"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="5dp" />
+        android:layout_height="wrap_content" />
 
     <Button
         android:id="@+id/launch_mdp_app_button"
+        android:paddingTop="12dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="left"