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

Merge "Don't scroll when removing saved networks." into oc-dr1-dev am: 1e561edb45

Browse Source 
am: b963c1190f

Change-Id: I389ffac52942e382e145de94c166578d6ead48ad
This commit is contained in:
Sundeep Ghuman
2017-06-30 00:12:41 +00:00
committed by android-build-merger
parent b2c69878d1 b963c1190f
commit 0a1003a8df
2 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
View File

@@ -127,17 +127,25 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment
final List<AccessPoint> accessPoints = final List<AccessPoint> accessPoints =
WifiSavedConfigUtils.getAllConfigs(context, mWifiManager); WifiSavedConfigUtils.getAllConfigs(context, mWifiManager);
Collections.sort(accessPoints, SAVED_NETWORK_COMPARATOR); Collections.sort(accessPoints, SAVED_NETWORK_COMPARATOR);
preferenceScreen.removeAll(); cacheRemoveAllPrefs(preferenceScreen);
final int accessPointsSize = accessPoints.size(); final int accessPointsSize = accessPoints.size();
for (int i = 0; i < accessPointsSize; ++i){ for (int i = 0; i < accessPointsSize; ++i) {
AccessPoint ap = accessPoints.get(i);
String key = AccessPointPreference.generatePreferenceKey(ap);
LongPressAccessPointPreference preference = LongPressAccessPointPreference preference =
new LongPressAccessPointPreference(accessPoints.get(i), context, (LongPressAccessPointPreference) getCachedPreference(key);
mUserBadgeCache, true, this); if (preference == null) {
preference.setIcon(null); preference = new LongPressAccessPointPreference(
preferenceScreen.addPreference(preference); ap, context, mUserBadgeCache, true, this);
preference.setKey(key);
preference.setIcon(null);
preferenceScreen.addPreference(preference);
}
} }
removeCachedPrefs(preferenceScreen);
if(getPreferenceScreen().getPreferenceCount() < 1) { if(getPreferenceScreen().getPreferenceCount() < 1) {
Log.w(TAG, "Saved networks activity loaded, but there are no saved networks!"); Log.w(TAG, "Saved networks activity loaded, but there are no saved networks!");
} }

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

@@ -43,7 +43,6 @@ import android.provider.Settings;
import android.support.annotation.VisibleForTesting; import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory; import android.support.v7.preference.PreferenceCategory;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo; import android.view.ContextMenu.ContextMenuInfo;
@@ -735,7 +734,7 @@ public class WifiSettings extends RestrictedSettingsFragment
AccessPoint accessPoint = accessPoints.get(index); AccessPoint accessPoint = accessPoints.get(index);
// Ignore access points that are out of range. // Ignore access points that are out of range.
if (accessPoint.isReachable()) { if (accessPoint.isReachable()) {
String key = generateKey(accessPoint); String key = AccessPointPreference.generatePreferenceKey(accessPoint);
hasAvailableAccessPoints = true; hasAvailableAccessPoints = true;
LongPressAccessPointPreference pref = LongPressAccessPointPreference pref =
(LongPressAccessPointPreference) getCachedPreference(key); (LongPressAccessPointPreference) getCachedPreference(key);
@@ -777,18 +776,6 @@ public class WifiSettings extends RestrictedSettingsFragment
} }
} }
private String generateKey(AccessPoint accessPoint) {
StringBuilder key = new StringBuilder();
String bssid = accessPoint.getBssid();
if (TextUtils.isEmpty(bssid)) {
key.append(accessPoint.getSsidStr());
} else {
key.append(bssid);
}
key.append(',').append(accessPoint.getSecurity());
return key.toString();
}
@NonNull @NonNull
private LongPressAccessPointPreference createLongPressActionPointPreference( private LongPressAccessPointPreference createLongPressActionPointPreference(
AccessPoint accessPoint) { AccessPoint accessPoint) {