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

Merge "Implement WifiNetworkListFragment - Part 3"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-25 02:46:39 +00:00
committed by Android (Google) Code Review
parent 846cacbd0b 17fc3ec944
commit 403efc9c1b
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java
View File

@@ -48,7 +48,6 @@ public class WifiNetworkListFragment extends SettingsPreferenceFragment implemen
private static final String TAG = "WifiNetworkListFragment"; private static final String TAG = "WifiNetworkListFragment";
private static final String WIFI_CONFIG_KEY = "wifi_config_key"; private static final String WIFI_CONFIG_KEY = "wifi_config_key";
private static final String PREF_KEY_EMPTY_WIFI_LIST = "wifi_empty_list";
private static final String PREF_KEY_ACCESS_POINTS = "access_points"; private static final String PREF_KEY_ACCESS_POINTS = "access_points";
static final int ADD_NETWORK_REQUEST = 1; static final int ADD_NETWORK_REQUEST = 1;
@@ -277,7 +276,6 @@ public class WifiNetworkListFragment extends SettingsPreferenceFragment implemen
// AccessPoints are sorted by the WifiTracker // AccessPoints are sorted by the WifiTracker
final List<AccessPoint> accessPoints = mWifiTracker.getAccessPoints(); final List<AccessPoint> accessPoints = mWifiTracker.getAccessPoints();
boolean hasAvailableAccessPoints = false;
mAccessPointsPreferenceCategory.setVisible(true); mAccessPointsPreferenceCategory.setVisible(true);
cacheRemoveAllPrefs(mAccessPointsPreferenceCategory); cacheRemoveAllPrefs(mAccessPointsPreferenceCategory);
@@ -299,7 +297,6 @@ public class WifiNetworkListFragment extends SettingsPreferenceFragment implemen
return; return;
} }
hasAvailableAccessPoints = true;
final AccessPointPreference pref = (AccessPointPreference) getCachedPreference(key); final AccessPointPreference pref = (AccessPointPreference) getCachedPreference(key);
if (pref != null) { if (pref != null) {
pref.setOrder(index); pref.setOrder(index);
@@ -317,15 +314,6 @@ public class WifiNetworkListFragment extends SettingsPreferenceFragment implemen
removeCachedPrefs(mAccessPointsPreferenceCategory); removeCachedPrefs(mAccessPointsPreferenceCategory);
mAddPreference.setOrder(index); mAddPreference.setOrder(index);
mAccessPointsPreferenceCategory.addPreference(mAddPreference); mAccessPointsPreferenceCategory.addPreference(mAddPreference);
if (!hasAvailableAccessPoints) {
final Preference pref = new Preference(getPrefContext());
pref.setSelectable(false);
pref.setSummary(R.string.wifi_empty_list_wifi_on);
pref.setOrder(index++);
pref.setKey(PREF_KEY_EMPTY_WIFI_LIST);
mAccessPointsPreferenceCategory.addPreference(pref);
}
} }
private AccessPointPreference createAccessPointPreference(AccessPoint accessPoint) { private AccessPointPreference createAccessPointPreference(AccessPoint accessPoint) {