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

Merge "[Wi-Fi] Fix a UI defect of AddAppNetworksFragment"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-25 04:49:40 +00:00
committed by Android (Google) Code Review
parent 03a7573e4b e7c2bc6e1a
commit 345ba41111
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
View File

@@ -750,21 +750,29 @@ public class AddAppNetworksFragment extends InstrumentedFragment implements
@VisibleForTesting
void updateScanResultsToUi(List<WifiEntry> allEntries) {
void updateScanResultsToUi() {
if (mUiToRequestedList == null) {
// Nothing need to be updated.
return;
}
List<WifiEntry> reachableWifiEntries = null;
if (mWifiPickerTracker.getWifiState() == WifiManager.WIFI_STATE_ENABLED) {
reachableWifiEntries = mWifiPickerTracker.getWifiEntries();
final WifiEntry connectedWifiEntry = mWifiPickerTracker.getConnectedWifiEntry();
if (connectedWifiEntry != null) {
reachableWifiEntries.add(connectedWifiEntry);
}
}
// Update the signal level of the UI networks.
for (UiConfigurationItem uiConfigurationItem : mUiToRequestedList) {
uiConfigurationItem.mLevel = 0;
if (allEntries != null) {
final Optional<WifiEntry> matchedWifiEntry = allEntries.stream()
if (reachableWifiEntries != null) {
final Optional<WifiEntry> matchedWifiEntry = reachableWifiEntries.stream()
.filter(wifiEntry -> TextUtils.equals(
uiConfigurationItem.mWifiNetworkSuggestion.getSsid(),
wifiEntry.getSsid()))
.filter(wifiEntry -> !wifiEntry.isSaved())
.findFirst();
uiConfigurationItem.mLevel =
matchedWifiEntry.isPresent() ? matchedWifiEntry.get().getLevel() : 0;
@@ -797,9 +805,7 @@ public class AddAppNetworksFragment extends InstrumentedFragment implements
*/
@Override
public void onWifiEntriesChanged() {
updateScanResultsToUi(
(mWifiPickerTracker.getWifiState() == WifiManager.WIFI_STATE_ENABLED)
? mWifiPickerTracker.getWifiEntries() : null);
updateScanResultsToUi();
}
@Override