commit 5f3442af6f1d1141f8f4dff033d4176214281b81
author Fabrice Di Meglio <fdimeglio@google.com> Fri Mar 21 13:50:25 2014 -0700
committer Fabrice Di Meglio <fdimeglio@google.com> Fri Mar 21 13:50:25 2014 -0700
tree 4070b91ee6edc70bf806e4b55cfbbb8d1e2440f5
parent 51bfee595c3ce587e2e26565fd9e8f4ae02c3482

Use SearchIndexableData enable state for WiFi Settings

- same as for Bluetooth
- now the remembered WiFi networks names can be indexed when
WiFi is turned on

Change-Id: I904ce6a425c21ee07ce3ee8fdc0cd71ab5a18d12

src/com/android/settings/wifi/WifiEnabler.java

diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index a6989f0..ad0ba56 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -33,6 +33,7 @@
 
 import com.android.settings.R;
 import com.android.settings.WirelessSettings;
+import com.android.settings.search.Index;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -136,6 +137,7 @@
             case WifiManager.WIFI_STATE_ENABLED:
                 setSwitchChecked(true);
                 mSwitch.setEnabled(true);
+                updateSearchIndex(true);
                 break;
             case WifiManager.WIFI_STATE_DISABLING:
                 mSwitch.setEnabled(false);
@@ -143,14 +145,20 @@
             case WifiManager.WIFI_STATE_DISABLED:
                 setSwitchChecked(false);
                 mSwitch.setEnabled(true);
+                updateSearchIndex(false);
                 break;
             default:
                 setSwitchChecked(false);
                 mSwitch.setEnabled(true);
-                break;
+                updateSearchIndex(false);
         }
     }
 
+    private void updateSearchIndex(boolean isWiFiOn) {
+        Index.getInstance(mContext).updateFromClassNameResource(
+                WifiSettings.class.getName(), isWiFiOn);
+    }
+
     private void setSwitchChecked(boolean checked) {
         if (checked != mSwitch.isChecked()) {
             mStateMachineEvent = true;

src/com/android/settings/wifi/WifiSettings.java

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index c911ead..667feb3 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -1195,6 +1195,7 @@
                     data = new SearchIndexableRaw(context);
                     data.title = accessPoint.getTitle().toString();
                     data.screenTitle = res.getString(R.string.wifi_settings);
+                    data.enabled = enabled;
                     result.add(data);
                 }