Changed text and appearance when Wifi/Bluetooth is off

A TextView is used as an empty view, centered on screen with the message.

Change-Id: I33825775d6b2ed212e5839cfac84d055b9336667

1 files changed, 17 insertions, 13 deletions

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 3fd1bef..74400d4 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -56,6 +56,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.Switch;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.android.internal.util.AsyncChannel;
@@ -106,6 +107,9 @@ public class WifiSettings extends SettingsPreferenceFragment
 
     private WifiDialog mDialog;
 
+    private View mView;
+    private TextView mEmptyView;
+
     /* Used in Wifi Setup context */
 
     // this boolean extra specifies whether to disable the Next button when not connected
@@ -149,11 +153,8 @@ public class WifiSettings extends SettingsPreferenceFragment
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
-        if (mInXlSetupWizard) {
-            return inflater.inflate(R.layout.custom_preference_list_fragment, container, false);
-        } else {
-            return super.onCreateView(inflater, container, savedInstanceState);
-        }
+        mView = inflater.inflate(R.layout.custom_preference_list_fragment, container, false);
+        return mView;
     }
 
     @Override
@@ -209,6 +210,9 @@ public class WifiSettings extends SettingsPreferenceFragment
             mWifiEnabler = new WifiEnabler(activity, actionBarSwitch);
         }
 
+        mEmptyView = (TextView) mView.findViewById(R.id.empty);
+        getListView().setEmptyView(mEmptyView);
+
         registerForContextMenu(getListView());
         setHasOptionsMenu(true);
 
@@ -398,12 +402,11 @@ public class WifiSettings extends SettingsPreferenceFragment
      * the strength of network and the security for it.
      */
     private void updateAccessPoints() {
-        final PreferenceScreen preferenceScreen = getPreferenceScreen();
-        preferenceScreen.removeAll();
         final int wifiState = mWifiManager.getWifiState();
 
         switch (wifiState) {
             case WifiManager.WIFI_STATE_ENABLED:
+                getPreferenceScreen().removeAll();
                 // AccessPoints are automatically sorted with TreeSet.
                 final Collection<AccessPoint> accessPoints = constructAccessPoints();
                 if (mInXlSetupWizard) {
@@ -416,6 +419,10 @@ public class WifiSettings extends SettingsPreferenceFragment
                 }
                 break;
 
+            case WifiManager.WIFI_STATE_ENABLING:
+                getPreferenceScreen().removeAll();
+                break;
+
             case WifiManager.WIFI_STATE_DISABLING:
                 addMessagePreference(R.string.wifi_stopping);
                 break;
@@ -427,9 +434,8 @@ public class WifiSettings extends SettingsPreferenceFragment
     }
 
     private void addMessagePreference(int messageId) {
-        Preference emptyListPreference = new Preference(getActivity());
-        emptyListPreference.setTitle(messageId);
-        getPreferenceScreen().addPreference(emptyListPreference);
+        if (mEmptyView != null) mEmptyView.setText(messageId);
+        getPreferenceScreen().removeAll();
     }
 
     private Collection<AccessPoint> constructAccessPoints() {
@@ -550,15 +556,13 @@ public class WifiSettings extends SettingsPreferenceFragment
         switch (state) {
             case WifiManager.WIFI_STATE_ENABLED:
                 mScanner.resume();
-                return; // not break, to avoid pause
+                return; // not break, to avoid the call to pause() below
 
             case WifiManager.WIFI_STATE_ENABLING:
-                getPreferenceScreen().removeAll();
                 addMessagePreference(R.string.wifi_starting);
                 break;
 
             case WifiManager.WIFI_STATE_DISABLED:
-                getPreferenceScreen().removeAll();
                 addMessagePreference(R.string.wifi_empty_list_wifi_off);
                 break;
         }