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 am: c707a93d00

Browse Source 
Change-Id: If1dc968d1fd0ebca7fbe4dc45c7ab47c3a2f6215
This commit is contained in:
Arc Wang
2020-04-07 07:26:45 +00:00
committed by Automerger Merge Worker
parent 664adc4691 c707a93d00
commit c5c5d38005
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 List<String> keys = super.getNonIndexableKeys(context);
final WifiManager wifiManager = context.getSystemService(WifiManager.class); final WifiManager wifiManager = context.getSystemService(WifiManager.class);
final List<AccessPoint> accessPoints = WifiSavedConfigUtils.getAllConfigs( if (WifiSavedConfigUtils.getAllConfigsCount(context, wifiManager) == 0) {
context, wifiManager);
if (accessPoints == null || accessPoints.size() <= 0) {
keys.add(PREF_KEY_SAVED_NETWORKS); 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.Indexable;
import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.wifi.LongPressWifiEntryPreference; import com.android.settingslib.wifi.LongPressWifiEntryPreference;
import com.android.settingslib.wifi.WifiSavedConfigUtils;
import com.android.wifitrackerlib.WifiEntry; import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiEntry.ConnectCallback; import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
import com.android.wifitrackerlib.WifiPickerTracker; import com.android.wifitrackerlib.WifiPickerTracker;
@@ -1027,7 +1028,22 @@ public class WifiSettings2 extends RestrictedSettingsFragment
}; };
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = 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 { private class WifiEntryConnectCallback implements ConnectCallback {
final WifiEntry mConnectWifiEntry; final WifiEntry mConnectWifiEntry;