Merge "[WifiSettings] Refactor Wi-Fi required info"

2015-03-11 23:22:19 +00:00
parent 6b345581d2 b484340e3d
commit 6cdfb05b31
6 changed files with 30 additions and 37 deletions
--- 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;