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

Refersh saved Wi-Fi networks

Browse Source 
- Refresh existing saved networks with the same key of WifiEntry

- Update Wi-Fi icon when connection status changes

Bug: 290644817
Bug: 291032267
Bug: 293468313
Bug: 294866208
Test: Manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiEntryPreferenceTest
make RunSettingsRoboTests ROBOTEST_FILTER=SavedAccessPointsPreferenceController2Test

Change-Id: Ifadfb7c46edf8eda32e4ff5dcb6bb3ff086447c8
This commit is contained in:
Weng Su
2023-08-07 20:50:17 +08:00
parent 857778a856
commit 1962145282
4 changed files with 113 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsPreferenceController2.java
View File

@@ -66,6 +66,7 @@ public class SavedAccessPointsPreferenceController2 extends BasePreferenceContro
super.displayPreference(screen);
}
@VisibleForTesting
void displayPreference(PreferenceScreen screen, List<WifiEntry> wifiEntries) {
if (wifiEntries == null || wifiEntries.isEmpty()) {
mWifiEntries.clear();
@@ -89,28 +90,32 @@ public class SavedAccessPointsPreferenceController2 extends BasePreferenceContro
* mPreferenceGroup.removeAll() then mPreferenceGroup.addPreference for mWifiEntries.
*/
private void updatePreference() {
// Remove the Preference of removed WifiEntry.
final List<String> removedPreferenceKeys = new ArrayList<>();
final int preferenceCount = mPreferenceGroup.getPreferenceCount();
// Update WifiEntry to existing preference and find out which WifiEntry was removed by key.
List<String> removedKeys = new ArrayList<>();
int preferenceCount = mPreferenceGroup.getPreferenceCount();
for (int i = 0; i < preferenceCount; i++) {
final String key = mPreferenceGroup.getPreference(i).getKey();
if (mWifiEntries.stream().filter(wifiEntry ->
TextUtils.equals(key, wifiEntry.getKey())).count() == 0) {
removedPreferenceKeys.add(key);
WifiEntryPreference pref = (WifiEntryPreference) mPreferenceGroup.getPreference(i);
WifiEntry wifiEntry = mWifiEntries.stream()
.filter(entry -> TextUtils.equals(pref.getKey(), entry.getKey()))
.findFirst()
.orElse(null);
if (wifiEntry != null) {
pref.setWifiEntry(wifiEntry);
} else {
removedKeys.add(pref.getKey());
}
}
for (String removedPreferenceKey : removedPreferenceKeys) {
mPreferenceGroup.removePreference(
mPreferenceGroup.findPreference(removedPreferenceKey));
// Remove preference by WifiEntry's key.
for (String removedKey : removedKeys) {
mPreferenceGroup.removePreference(mPreferenceGroup.findPreference(removedKey));
}
// Add the Preference of new added WifiEntry.
for (WifiEntry wifiEntry : mWifiEntries) {
if (mPreferenceGroup.findPreference(wifiEntry.getKey()) == null) {
final WifiEntryPreference preference = new WifiEntryPreference(mContext, wifiEntry);
WifiEntryPreference preference = new WifiEntryPreference(mContext, wifiEntry);
preference.setKey(wifiEntry.getKey());
preference.setOnPreferenceClickListener(this);
mPreferenceGroup.addPreference(preference);
}
}