PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Wi-Fi] Index Wi-Fi preferences." into rvc-dev

Browse Source
This commit is contained in:
Arc Wang
2020-04-07 07:16:26 +00:00
committed by Android (Google) Code Review
parent 4edb83b260 fd3360d28b
commit c707a93d00
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -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);
}

18
src/com/android/settings/wifi/WifiSettings2.java
View File

@@ -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;