diff options
| author | Quang Luong <qal@google.com> | 2020-09-11 18:57:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-11 18:57:42 +0000 |
| commit | b70296653d154986ffe908449131fd65a7da65c4 (patch) | |
| tree | 49af82cb96372c66866da0a3eae2cfa09c11da76 /packages/SettingsLib/src | |
| parent | 8513ac2afc6728c4370085f4b98a9e8a7cc3d5e6 (diff) | |
| parent | a2da145ff6cdf0767b91998c17d33d0c601c543c (diff) | |
Merge "Use WifiEntry#shouldShowXLevelIcon() to show X in level icon" into rvc-qpr-dev am: a2da145ff6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12475283
Change-Id: I1910ca04565e936cd5054cb199aa074ead91cc0e
Diffstat (limited to 'packages/SettingsLib/src')
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java index bba69f29a290..aad0d3af6626 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java @@ -35,7 +35,6 @@ import androidx.preference.PreferenceViewHolder; import com.android.settingslib.R; import com.android.settingslib.Utils; import com.android.wifitrackerlib.WifiEntry; -import com.android.wifitrackerlib.WifiEntry.ConnectedInfo; /** * Preference to display a WifiEntry in a wifi picker. @@ -138,11 +137,7 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt public void refresh() { setTitle(mWifiEntry.getTitle()); final int level = mWifiEntry.getLevel(); - final ConnectedInfo connectedInfo = mWifiEntry.getConnectedInfo(); - boolean showX = false; - if (connectedInfo != null) { - showX = !connectedInfo.isDefaultNetwork || !connectedInfo.isValidated; - } + final boolean showX = mWifiEntry.shouldShowXLevelIcon(); if (level != mLevel || showX != mShowX) { mLevel = level; mShowX = showX; |