summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2015-03-05 11:20:47 -0800
committerMaurice Lam <yukl@google.com>2015-03-11 23:03:07 +0000
commitb484340e3d8b7d005dcf7466c4fa463a808b96c4 (patch)
treea530d291a11108e0c6ffe7d34d424763d43ac7fd /src
parentbc614dfcb59a8a58dbb20e54535e58aba69bd27c (diff)
downloadpackages_apps_Settings-b484340e3d8b7d005dcf7466c4fa463a808b96c4.zip
packages_apps_Settings-b484340e3d8b7d005dcf7466c4fa463a808b96c4.tar.gz
packages_apps_Settings-b484340e3d8b7d005dcf7466c4fa463a808b96c4.tar.bz2
[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
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/wifi/WifiSettingsForSetupWizard.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
index efa56d7..5716bec 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;