WiFi: Remove Wi-Fi standard from Wi-Fi icon [1/2]
* Dropped wifi standard from access point wifi icon.
* Set wifi standrad value to WIFI_STANDARD_UNKNOWN
Note: This change applies to AP scan list.
Issue: FP3-A11#301
Change-Id: I41afd7e2243fefd9ea4e4687d44b372f24957f36
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java
index 7f2bbad..8dc35f9 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java
@@ -74,7 +74,6 @@
private AccessPoint mAccessPoint;
private Drawable mBadge;
private int mLevel;
- private int mWifiStandard;
private boolean mHe8ssCapableAp;
private boolean mVhtMax8SpatialStreamsSupport;
private CharSequence mContentDescription;
@@ -239,21 +238,18 @@
final Context context = getContext();
int level = mAccessPoint.getLevel();
int wifiSpeed = mAccessPoint.getSpeed();
- int wifiStandard = mAccessPoint.getWifiStandard();
boolean vhtMax8SpatialStreamsSupport = mAccessPoint.isVhtMax8SpatialStreamsSupported();
boolean he8ssCapableAp = mAccessPoint.isHe8ssCapableAp();
if (level != mLevel ||
wifiSpeed != mWifiSpeed ||
- wifiStandard != mWifiStandard ||
mVhtMax8SpatialStreamsSupport != vhtMax8SpatialStreamsSupport ||
mHe8ssCapableAp != he8ssCapableAp) {
mLevel = level;
mWifiSpeed = wifiSpeed;
- mWifiStandard = wifiStandard;
mVhtMax8SpatialStreamsSupport = vhtMax8SpatialStreamsSupport;
mHe8ssCapableAp = he8ssCapableAp;
- updateIcon(mLevel, mWifiStandard, mVhtMax8SpatialStreamsSupport && mHe8ssCapableAp, context);
+ updateIcon(mLevel, 0 /* WIFI_STANDARD_UNKNOWN */, mVhtMax8SpatialStreamsSupport && mHe8ssCapableAp, context);
notifyChanged();
}
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java
index a1c504d..37faee7 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java
@@ -64,7 +64,6 @@
private final IconInjector mIconInjector;
private WifiEntry mWifiEntry;
private int mLevel = -1;
- private int mWifiStandard;
private boolean mVhtMax8SpatialStreamsSupport;
private boolean mHe8ssCapableAp;
private boolean mShowX; // Shows the Wi-Fi signl icon of Pie+x when it's true.
@@ -141,19 +140,17 @@
setTitle(mWifiEntry.getTitle());
final int level = mWifiEntry.getLevel();
final boolean showX = mWifiEntry.shouldShowXLevelIcon();
- final int standard = mWifiEntry.getWifiStandard();
final boolean vhtMax8SpatialStreamsSupport = mWifiEntry.isVhtMax8SpatialStreamsSupported();
final boolean he8ssCapableAp = mWifiEntry.isHe8ssCapableAp();
- if (level != mLevel || standard != mWifiStandard || he8ssCapableAp != mHe8ssCapableAp ||
+ if (level != mLevel || he8ssCapableAp != mHe8ssCapableAp ||
vhtMax8SpatialStreamsSupport != mVhtMax8SpatialStreamsSupport || showX != mShowX) {
mLevel = level;
mShowX = showX;
- mWifiStandard = standard;
mHe8ssCapableAp = he8ssCapableAp;
mVhtMax8SpatialStreamsSupport = vhtMax8SpatialStreamsSupport;
- updateIcon(mShowX, mLevel, mWifiStandard, mHe8ssCapableAp && mVhtMax8SpatialStreamsSupport);
+ updateIcon(mShowX, mLevel, 0 /* WIFI_STANDARD_UNKNOWN */, mHe8ssCapableAp && mVhtMax8SpatialStreamsSupport);
notifyChanged();
}