Merge "[Wi-Fi] Index Wi-Fi preferences." into rvc-dev am: c707a93d00 (5b9efb3d) · Commits · e / os / android_packages_apps_Settings

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -1304,9 +1304,7 @@ public class WifiSettings extends RestrictedSettingsFragment
		final List<String> keys = super.getNonIndexableKeys(context);

		final WifiManager wifiManager = context.getSystemService(WifiManager.class);
		final List<AccessPoint> accessPoints = WifiSavedConfigUtils.getAllConfigs(
		context, wifiManager);
		if (accessPoints == null \|\| accessPoints.size() <= 0) {
		if (WifiSavedConfigUtils.getAllConfigsCount(context, wifiManager) == 0) {
		keys.add(PREF_KEY_SAVED_NETWORKS);
		}

+17 −1

Original line number	Diff line number	Diff line
		@@ -76,6 +76,7 @@ import com.android.settingslib.RestrictedLockUtilsInternal;
		import com.android.settingslib.search.Indexable;
		import com.android.settingslib.search.SearchIndexable;
		import com.android.settingslib.wifi.LongPressWifiEntryPreference;
		import com.android.settingslib.wifi.WifiSavedConfigUtils;
		import com.android.wifitrackerlib.WifiEntry;
		import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
		import com.android.wifitrackerlib.WifiPickerTracker;
		@@ -1027,7 +1028,22 @@ public class WifiSettings2 extends RestrictedSettingsFragment
		};

		public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider(R.xml.wifi_settings2);
		new BaseSearchIndexProvider(R.xml.wifi_settings2) {
		@Override
		public List<String> getNonIndexableKeys(Context context) {
		final List<String> keys = super.getNonIndexableKeys(context);

		final WifiManager wifiManager = context.getSystemService(WifiManager.class);
		if (WifiSavedConfigUtils.getAllConfigsCount(context, wifiManager) == 0) {
		keys.add(PREF_KEY_SAVED_NETWORKS);
		}

		if (!DataUsageUtils.hasWifiRadio(context)) {
		keys.add(PREF_KEY_DATA_USAGE);
		}
		return keys;
		}
		};

		private class WifiEntryConnectCallback implements ConnectCallback {
		final WifiEntry mConnectWifiEntry;