From b484340e3d8b7d005dcf7466c4fa463a808b96c4 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 5 Mar 2015 11:20:47 -0800
Subject: [PATCH] [WifiSettings] Refactor Wi-Fi required info

Instead of using an invisible TextView in the layout itself, make the
required info a list header. This paves way for using the Setup
Wizard library by including all the required contents in the ListView
itself.

The required info is not shown since Lollipop, but can be tested with
    adb shell am start -a "com.android.net.wifi.SETUP_WIFI_NETWORK" \
            --es theme material_light \
            --ez useImmersiveMode true \
            --ez wifi_show_wifi_required_info true

Bug: 19698532
Change-Id: I5a7da726b2f49af7dd755b41c73e1a1b4349699c
---
 res/layout-land/setup_preference.xml          |  9 -------
 res/layout-sw600dp-land/setup_preference.xml  |  9 -------
 res/layout-sw600dp/setup_preference.xml       |  9 -------
 res/layout/setup_preference.xml               |  9 -------
 res/layout/setup_wifi_required_info.xml       | 27 +++++++++++++++++++
 .../wifi/WifiSettingsForSetupWizard.java      |  4 ++-
 6 files changed, 30 insertions(+), 37 deletions(-)
 create mode 100644 res/layout/setup_wifi_required_info.xml

diff --git a/res/layout-land/setup_preference.xml b/res/layout-land/setup_preference.xml
index b525b689f32..bee46ed1bbe 100644
--- a/res/layout-land/setup_preference.xml
+++ b/res/layout-land/setup_preference.xml
@@ -37,15 +37,6 @@
 
     </FrameLayout>
 
-    <TextView
-        android:id="@+id/wifi_required_info"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="6dp"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="@string/wifi_required_info_text"
-        android:visibility="gone" />
-
     <ListView
         android:id="@android:id/list"
         android:layout_width="match_parent"
diff --git a/res/layout-sw600dp-land/setup_preference.xml b/res/layout-sw600dp-land/setup_preference.xml
index 814bc915ced..883d1de11de 100644
--- a/res/layout-sw600dp-land/setup_preference.xml
+++ b/res/layout-sw600dp-land/setup_preference.xml
@@ -53,15 +53,6 @@
                 android:elevation="@dimen/setup_wizard_card_elevation"
                 android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/wifi_required_info"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="6dp"
-                    android:text="@string/wifi_required_info_text"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:visibility="gone" />
-
                 <ListView
                     android:id="@android:id/list"
                     android:layout_width="match_parent"
diff --git a/res/layout-sw600dp/setup_preference.xml b/res/layout-sw600dp/setup_preference.xml
index ec6d2ac9323..cc120035314 100644
--- a/res/layout-sw600dp/setup_preference.xml
+++ b/res/layout-sw600dp/setup_preference.xml
@@ -51,15 +51,6 @@
                 android:elevation="@dimen/setup_wizard_card_elevation"
                 android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/wifi_required_info"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="6dp"
-                    android:text="@string/wifi_required_info_text"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:visibility="gone" />
-
                 <ListView
                     android:id="@android:id/list"
                     android:layout_width="match_parent"
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index 46829c0c078..d07d4a38a7c 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -22,15 +22,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/wifi_required_info"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="6dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="@string/wifi_required_info_text"
-        android:visibility="gone" />
-
     <com.android.settings.widget.StickyHeaderListView
         android:id="@android:id/list"
         android:layout_width="match_parent"
diff --git a/res/layout/setup_wifi_required_info.xml b/res/layout/setup_wifi_required_info.xml
new file mode 100644
index 00000000000..574366af7d3
--- /dev/null
+++ b/res/layout/setup_wifi_required_info.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/wifi_required_info"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/setup_wizard_margin_top"
+    android:paddingBottom="6dip"
+    android:paddingStart="@dimen/setup_wizard_margin_sides"
+    android:paddingEnd="@dimen/setup_wizard_margin_sides"
+    android:text="@string/wifi_required_info_text"
+    android:textAppearance="@style/TextAppearance.SetupWizardDescription" />
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
index efa56d706d5..5716bec1d49 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
@@ -73,7 +73,9 @@ public class WifiSettingsForSetupWizard extends WifiSettings {
 
         final Intent intent = getActivity().getIntent();
         if (intent.getBooleanExtra(EXTRA_SHOW_WIFI_REQUIRED_INFO, false)) {
-            view.findViewById(R.id.wifi_required_info).setVisibility(View.VISIBLE);
+            final View requiredInfo =
+                    inflater.inflate(R.layout.setup_wifi_required_info, list, false);
+            list.addHeaderView(requiredInfo, null, false);
         }
 
         return view;