From c3633c0dbf38b3fb57121efd4d29f88f75ab81ca Mon Sep 17 00:00:00 2001 From: Quang Luong Date: Thu, 27 Aug 2020 17:07:15 -0700 Subject: Use WifiEntry#shouldShowXLevelIcon() to show X in level icon Bug: 163627176 Test: make RunSettingsLibRoboTests ROBOTEST_FILTER=WifiEntryPreferenceTest Change-Id: Icc62c6e1b8a3e13bf8e37eeb358fb8532907a65c --- .../src/com/android/settingslib/wifi/WifiEntryPreference.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'packages/SettingsLib/src') 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; -- cgit v1.2.3