SetupWizard: More refactor to match redlines

Change-Id: I74f422ba0c294d5e91aefb9356458c681cc53b37

4 files changed, 15 insertions, 14 deletions

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 951d28e..89f30c6 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -20,10 +20,11 @@
     <color name="window_background">#e4e7e8</color>
     <color name="page_background">#efefef</color>
 
-    <color name="primary">#2196f3</color>
-    <color name="primary_dark">#1481d8</color>
+    <color name="primary">#00B1E5</color>
+    <color name="primary_dark">#00A2E5</color>
     <color name="accent">#009789</color>
     <color name="primary_text">#8a000000</color>
     <color name="secondary_text">#727272</color>
     <color name="divider">#40000000</color>
+    <color name="status_bar">@color/primary</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c0c91e8..d3c34d8 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -15,12 +15,13 @@
      limitations under the License.
 -->
 <resources>
-    <dimen name="logo_header_height">290dp</dimen>
+    <dimen name="logo_header_height">220dp</dimen>
     <dimen name="header_height">220dp</dimen>
     <dimen name="page_title_height">56dp</dimen>
     <dimen name="header_title_margin_left">26dp</dimen>
     <dimen name="header_logo_margin_left">25dp</dimen>
     <dimen name="header_logo_margin_bottom">11dp</dimen>
+    <dimen name="header_logo_margin_top">30dp</dimen>
     <dimen name="content_margin_top">26dp</dimen>
     <dimen name="content_margin_left">26dp</dimen>
     <dimen name="content_margin_right">14dp</dimen>
@@ -31,4 +32,6 @@
     <dimen name="location_text_margin_right">30dp</dimen>
     <dimen name="data_switch_margin_right">30dp</dimen>
     <dimen name="carrier_text_margin_left">15dp</dimen>
+    <dimen name="setup_line_spacing">3sp</dimen>
+    <dimen name="min_locale_picker_height">100dp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bda7eac..31c0da7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -49,9 +49,9 @@
     <string name="date_time_summary">Set your time zone and adjust current date and time if needed</string>
 
     <string name="location_services_summary">Location services allows Maps and other apps to gather and use data such as your approximate location. For example, Maps may use your approximate location to locate nearby coffee shops.</string>
-    <string name="location_access_summary">Allow apps that have asked your permission to use your location information. This may include your current location and past locations.</string>
-    <string name="location_gps">Improve location accuracy by allowing apps to use the GPS on your phone.</string>
-    <string name="location_network">Use Google\'s location service to help apps determine your location. This means sending annonymous location data to Google, even when no apps are running.</string>
+    <string name="location_access_summary"><b>Allow apps that have asked your permission</b> to use your location information. This may include your current location and past locations.</string>
+    <string name="location_gps"><b>Improve location accuracy</b> by allowing apps to use the GPS on your phone.</string>
+    <string name="location_network"><b>Use Google\'s location service</b> to help apps determine your location. This means sending annonymous location data to Google, even when no apps are running.</string>
 
     <string name="setup_mobile_data">Turn On Mobile Data</string>
     <string name="setup_mobile_data_no_service">No service</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b42d118..36dda1d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,17 +18,15 @@
     <style name="Theme.Setup" parent="@android:style/Theme.Material.Light">
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
+        <item name="android:windowBackground">@color/primary</item>
         <item name="android:windowActivityTransitions">true</item>
         <item name="android:windowContentTransitions">true</item>
+        <item name="android:windowExitTransition">@android:transition/explode</item>
         <item name="android:colorPrimary">@color/primary</item>
-        <item name="android:colorPrimaryDark">@color/primary</item>
+        <item name="android:colorPrimaryDark">#00000000</item>
         <item name="android:colorAccent">@color/accent</item>
     </style>
 
-    <style name="RootView">
-        <item name="android:background">@color/window_background</item>
-    </style>
-
     <style name="Header">
         <item name="android:elevation">4dp</item>
         <item name="android:background">@color/primary</item>
@@ -36,13 +34,11 @@
 
     <style name="PageContainer">
         <item name="android:textColor">@color/primary_text</item>
-        <item name="android:background">@color/page_background</item>
     </style>
 
     <style name="PageContent">
+        <item name="android:background">@color/page_background</item>
         <item name="android:paddingTop">@dimen/content_margin_top</item>
-        <item name="android:paddingLeft">@dimen/content_margin_left</item>
-        <item name="android:paddingRight">@dimen/content_margin_right</item>
     </style>
 
     <style name="PageTitle">
@@ -57,6 +53,7 @@
 
     <style name="PageSummaryText">
         <item name="android:id">@android:id/summary</item>
+        <item name="android:lineSpacingExtra">@dimen/setup_line_spacing</item>
     </style>
 
     <style name="SpinnerItem">