From 859dcab128d804ec50f84779cdbf95f1505bae0e Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Wed, 14 Jan 2015 15:37:36 -0800
Subject: Remove grey Wi-Fi icon from Setup Wizard

This removes the grey Wi-Fi icon from the empty-view in the Wi-Fi
list of Setup Wizard. Also updated the style so it looks like the
description text in other setup screens.
Also fixed the view recycling by not calling getRootAdapter in
onActivityCreated, since that will cause the Preference framework
to not cache the AccessPoint preference.

Bug: 17575719
Bug: 16518752
Change-Id: I06cbc88db1c04b29a9ce8221596265effc39b90b
---
 res/values/dimens.xml | 1 +
 res/values/styles.xml | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'res/values')

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0085a08..6f7f7eb 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -58,6 +58,7 @@
     <dimen name="setup_wizard_card_port_margin_sides">56dp</dimen>
     <dimen name="setup_wizard_card_land_margin_top">128dp</dimen>
     <dimen name="setup_wizard_margin_sides">40dp</dimen>
+    <dimen name="setup_wizard_margin_top">24dp</dimen>
     <dimen name="setup_wizard_title_area_elevation">3dp</dimen>
 
     <dimen name="divider_height">3dip</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 626fc27..eacf7bc 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -187,6 +187,9 @@
         <item name="android:textColor">@android:color/white</item>
     </style>
 
+    <style name="TextAppearance.SetupWizardDescription" parent="@android:style/TextAppearance.Material.Subhead">
+    </style>
+
     <style name="SetupAddWifiNetwork">
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:gravity">start|center_vertical</item>
-- 
cgit v1.1