From dde458c031501c6c8a874458308656367eeb3628 Mon Sep 17 00:00:00 2001
From: Jan Nordqvist <jannq@google.com>
Date: Fri, 16 Mar 2018 15:40:52 -0700
Subject: [PATCH] Fixed "Primary data" text style and rearranged UI vertically.

Bug: 70950124

Test: manual
Test: make RunSettingsRoboTests
Change-Id: I5848f8b499aaac911c61860aa1471c9d391614bb
---
 res/layout/data_usage_summary_preference.xml | 47 +++++++++++---------
 res/values/strings.xml                       |  2 +-
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/res/layout/data_usage_summary_preference.xml b/res/layout/data_usage_summary_preference.xml
index eda8a81e250..c6d77691f09 100644
--- a/res/layout/data_usage_summary_preference.xml
+++ b/res/layout/data_usage_summary_preference.xml
@@ -18,7 +18,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="24dp"
+    android:paddingTop="22dp"
     android:paddingBottom="32dp"
     android:paddingStart="@dimen/preference_no_icon_padding_start"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
@@ -31,8 +31,7 @@
         android:id="@+id/usage_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textColor="?android:attr/colorAccent"
         android:text="@string/data_usage_title" />
 
     <LinearLayout
@@ -40,7 +39,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="12dp"
-        android:paddingBottom="4dp"
         android:orientation="horizontal">
 
         <TextView android:id="@+id/data_usage_view"
@@ -76,7 +74,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="4dp"
-        android:paddingBottom="8dp"
         android:orientation="horizontal">
 
         <TextView android:id="@android:id/text1"
@@ -98,32 +95,38 @@
 
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/cycle_left_time"
-        android:paddingTop="4dp"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:paddingTop="12dp"
+        android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/carrier_and_update"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        <TextView
+            android:id="@+id/data_limits"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="?android:attr/textColorSecondary" />
+
+        <TextView
+            android:id="@+id/cycle_left_time"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/carrier_and_update"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
 
     <Button
         android:id="@+id/launch_mdp_app_button"
-        android:paddingTop="12dp"
+        android:layout_marginTop="12dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="left"
+        android:layout_gravity="start"
         android:text="@string/launch_mdp_app_text"
         style="@style/ActionPrimaryButton" />
 
-    <TextView
-        android:id="@+id/data_limits"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="5dp"
-        android:textColor="?android:attr/textColorSecondary" />
-
 </LinearLayout>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9f2fe1bbcb4..44411267de8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8783,7 +8783,7 @@
     <string name="no_carrier_update_text">Updated <xliff:g name="time" example="3m">%1$s</xliff:g></string>
 
     <!-- Button to launch external data plan app [CHAR LIMIT=30] -->
-    <string name="launch_mdp_app_text">VIEW PLAN</string>
+    <string name="launch_mdp_app_text">View plan</string>
 
     <!-- Name of Data Saver screens [CHAR LIMIT=30] -->
     <string name="data_saver_title">Data saver</string>