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

[Wi-Fi] Refine code for saved AccessPoints

Browse Source 
SubscribedAccessPointsPreferenceController extends from
SavedAccessPointsPreferenceController to remove duplicate
code.

Bug: 127206629
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.savedaccesspoints
      Manual: Add and forget Wi-Fi accesspoints and observe UI display.

Change-Id: Ia494117ae98f043ce65b2f9f6e4b4daccc8df543
This commit is contained in:
Arc Wang
2019-10-14 10:32:57 +08:00
parent 1605b0364c
commit 21683140e9
4 changed files with 11 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceController.java
View File

@@ -30,7 +30,6 @@ import com.android.settingslib.wifi.AccessPointPreference;
import com.android.settingslib.wifi.AccessPointPreference.UserBadgeCache;
import com.android.settingslib.wifi.WifiSavedConfigUtils;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@@ -40,17 +39,14 @@ import java.util.stream.Collectors;
public class SavedAccessPointsPreferenceController extends BasePreferenceController implements
Preference.OnPreferenceClickListener {
private static final String TAG = "SavedApPrefCtrl";
private final WifiManager mWifiManager;
protected final WifiManager mWifiManager;
private final UserBadgeCache mUserBadgeCache;
private PreferenceGroup mPreferenceGroup;
private SavedAccessPointsWifiSettings mHost;
@VisibleForTesting
List<AccessPoint> mAccessPoints;
public SavedAccessPointsPreferenceController(Context context,
String preferenceKey) {
public SavedAccessPointsPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
mUserBadgeCache = new AccessPointPreference.UserBadgeCache(context.getPackageManager());
mWifiManager = context.getSystemService(WifiManager.class);
@@ -84,7 +80,7 @@ public class SavedAccessPointsPreferenceController extends BasePreferenceControl
return false;
}
private void refreshSavedAccessPoints() {
protected void refreshSavedAccessPoints() {
mAccessPoints = WifiSavedConfigUtils.getAllConfigs(mContext, mWifiManager).stream()
.filter(accessPoint -> !accessPoint.isPasspointConfig())
.sorted(SavedNetworkComparator.INSTANCE)