From 3b6b9172e4a85103327cbafd70dc8a21aa03fc27 Mon Sep 17 00:00:00 2001
From: Tony Mantler <nicoya@google.com>
Date: Mon, 31 Mar 2014 15:55:38 -0700
Subject: [PATCH] More setup layout tweaks

b/13675117
b/13677552

Change-Id: I8a89d634f0c1d6e0766b6ecf0a839abc03864af6
---
 res/layout-w600dp/account_setup_basics_fragment.xml |  2 +-
 res/layout/account_setup_basics_fragment.xml        |  2 +-
 res/layout/quick_response_item.xml                  |  2 +-
 res/values-w600dp/dimensions.xml                    |  4 ++++
 res/values/colors.xml                               |  2 ++
 res/values/dimensions.xml                           | 10 +++++++---
 res/values/styles.xml                               |  8 ++++++++
 7 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/res/layout-w600dp/account_setup_basics_fragment.xml b/res/layout-w600dp/account_setup_basics_fragment.xml
index 85375bff5..982bb6cd6 100644
--- a/res/layout-w600dp/account_setup_basics_fragment.xml
+++ b/res/layout-w600dp/account_setup_basics_fragment.xml
@@ -35,7 +35,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/accounts_welcome"
-            android:textAppearance="@style/account_setup_info_text" />
+            style="@style/account_setup_info_text" />
     <LinearLayout
             android:paddingTop="16dip"
             android:orientation="horizontal"
diff --git a/res/layout/account_setup_basics_fragment.xml b/res/layout/account_setup_basics_fragment.xml
index 2ad5f2985..f27db09eb 100644
--- a/res/layout/account_setup_basics_fragment.xml
+++ b/res/layout/account_setup_basics_fragment.xml
@@ -35,7 +35,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/accounts_welcome"
-            android:textAppearance="@style/account_setup_info_text" />
+            style="@style/account_setup_info_text" />
     <EditText
             android:id="@+id/account_email"
             android:hint="@string/account_setup_basics_email_label"
diff --git a/res/layout/quick_response_item.xml b/res/layout/quick_response_item.xml
index bc2919368..79bbde17a 100644
--- a/res/layout/quick_response_item.xml
+++ b/res/layout/quick_response_item.xml
@@ -28,7 +28,7 @@
             android:id="@+id/quick_response_text"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            style="@style/account_setup_info_text"
+            style="@style/quick_response_text"
             android:ellipsize="end"
             android:focusable="false"
             android:maxLines="2"
diff --git a/res/values-w600dp/dimensions.xml b/res/values-w600dp/dimensions.xml
index 5a599de4e..4f30426dd 100644
--- a/res/values-w600dp/dimensions.xml
+++ b/res/values-w600dp/dimensions.xml
@@ -40,4 +40,8 @@
     <dimen name="setup_item_inset_start">16dip</dimen>
     <dimen name="setup_item_inset_end">64dip</dimen>
 
+    <!-- Account setup basics -->
+    <dimen name="setup_basics_logo_margin_top">28dp</dimen>
+    <dimen name="setup_basics_logo_margin_bottom">56dp</dimen>
+
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 62833b7f2..1459a58d9 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -44,4 +44,6 @@
     <color name="password_warning_color">#FFA500</color>
     <color name="email_confirmation_color">#808080</color>
 
+    <color name="quick_response_text_color">#000000</color>
+
 </resources>
\ No newline at end of file
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 63e2a3547..2f1b70bf6 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -41,7 +41,7 @@
     <!-- Account setup fragments -->
     <!-- See also w600dp -->
     <dimen name="setup_fragment_padding_top">16dp</dimen>
-    <dimen name="setup_fragment_padding_side">16dp</dimen>
+    <dimen name="setup_fragment_padding_side">24dp</dimen>
     <dimen name="setup_fragment_padding_bottom">16dp</dimen>
 
     <!-- Account setup navigation buttons -->
@@ -61,6 +61,9 @@
     <dimen name="setup_headline_padding_top">24dp</dimen>
     <dimen name="setup_headline_padding_side">24dp</dimen>
 
+    <!-- Info text in any account setup screen -->
+    <dimen name="setup_info_text_margin_bottom">20dp</dimen>
+
     <!-- inset distance for settings buttons -->
     <dimen name="settings_buttons_padding_top">48dp</dimen>
     <dimen name="settings_buttons_padding_bottom">48dp</dimen>
@@ -70,8 +73,9 @@
     <dimen name="setup_item_inset_end">0dp</dimen>
 
     <!-- Account setup basics -->
-    <dimen name="setup_basics_logo_margin_top">28dp</dimen>
-    <dimen name="setup_basics_logo_margin_bottom">56dp</dimen>
+    <!-- See also w600dp -->
+    <dimen name="setup_basics_logo_margin_top">4dp</dimen>
+    <dimen name="setup_basics_logo_margin_bottom">4dp</dimen>
 
     <!-- TODO: probably delete these -->
     <!-- Notification dialog -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index cfe25b813..c88858747 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -62,6 +62,8 @@
     <style name="account_setup_info_text">
         <item name="android:textSize">20sp</item>
         <item name="android:textColor">@color/account_setup_info_text_color</item>
+        <item name="android:fontFamily">sans-serif-thin</item>
+        <item name="android:layout_marginBottom">@dimen/setup_info_text_margin_bottom</item>
     </style>
 
     <!-- Account setup row label text -->
@@ -89,5 +91,11 @@
         <item name="android:layout_alignParentLeft">true</item>
         <item name="android:layout_toLeftOf">@id/select_button</item>
     </style>
+
+    <!-- Quick response text -->
+    <style name="quick_response_text">
+        <item name="android:textSize">20sp</item>
+        <item name="android:textColor">@color/quick_response_text_color</item>
+    </style>
 </resources>