From 3264276e6cf55b254afbdf02c0fc9926d4db583b Mon Sep 17 00:00:00 2001
From: Martin Hibdon <mhibdon@google.com>
Date: Mon, 28 Apr 2014 12:10:32 -0700
Subject: [PATCH] Update the font for account setup basics

b/14386385

Change-Id: Ica54796333b48bb04822406a6e2a719570840949
---
 res/layout-w600dp/account_setup_basics_fragment.xml | 2 +-
 res/layout/account_setup_basics_fragment.xml        | 2 +-
 res/values/colors.xml                               | 1 +
 res/values/dimensions.xml                           | 3 +++
 res/values/styles.xml                               | 8 ++++++++
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/res/layout-w600dp/account_setup_basics_fragment.xml b/res/layout-w600dp/account_setup_basics_fragment.xml
index 87add7fbc..bb7387706 100644
--- a/res/layout-w600dp/account_setup_basics_fragment.xml
+++ b/res/layout-w600dp/account_setup_basics_fragment.xml
@@ -63,7 +63,7 @@
                 android:layout_width="wrap_content"
                 android:layout_marginRight="16dip"
                 android:text="@string/account_setup_basics_email_label"
-                style="@style/account_setup_label_text" />
+                style="@style/account_setup_label_large_text" />
         <EditText
                 android:id="@+id/account_email"
                 android:contentDescription="@string/account_setup_basics_email_label"
diff --git a/res/layout/account_setup_basics_fragment.xml b/res/layout/account_setup_basics_fragment.xml
index b20366e1d..ea1068632 100644
--- a/res/layout/account_setup_basics_fragment.xml
+++ b/res/layout/account_setup_basics_fragment.xml
@@ -57,6 +57,6 @@
             android:hint="@string/account_setup_basics_email_label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             android:inputType="textEmailAddress" />
 </LinearLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index b3b516230..f9a185c3f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -21,6 +21,7 @@
     <color name="account_setup_headline_color">#333333</color>
     <color name="account_setup_info_text_color">#000000</color>
     <color name="account_setup_label_text_color">#666666</color>
+    <color name="account_setup_label_large_text_color">#000000</color>
     <color name="account_setup_divider_color">#CCCCCC</color>
     <color name="account_setup_xlarge_background_color">#e5e5e5</color>
     <color name="account_setup_manual_button_color">#373737</color>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 591668b4a..f23e07e9c 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -66,6 +66,9 @@
     <!-- Info text in any account setup screen -->
     <dimen name="setup_info_text_margin_bottom">20dp</dimen>
 
+    <!-- Large label text on account setup basics -->
+    <dimen name="setup_label_large_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>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ae538ad90..eae88b954 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -89,6 +89,14 @@
         <item name="android:paddingTop">@dimen/setup_label_text_padding_top</item>
     </style>
 
+    <!-- Account setup row label large text -->
+    <style name="account_setup_label_large_text">
+        <item name="android:textSize">20sp</item>
+        <item name="android:textColor">@color/account_setup_label_large_text_color</item>
+        <item name="android:fontFamily">sans-serif-thin</item>
+        <item name="android:layout_marginBottom">@dimen/setup_label_large_text_margin_bottom</item>
+    </style>
+
     <!-- Account setup checkboxes -->
     <style name="account_setup_checkbox">
         <item name="android:paddingTop">@dimen/setup_checkbox_padding_top</item>