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

Display WiFi Version number

Browse Source 
- Display these type and hide the item in other case
   WIFI_STANDARD_11AX(6) WiFi 6
   WIFI_STANDARD_11AC(5) WiFi 5
   WIFI_STANDARD_11N (4) WiFi 4

-Screenshot
 https://photos.app.goo.gl/BbyZEQFyganEPfuw8

Bug: 117216087
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test

Change-Id: Ic360e501d2e3bd80ce3bcb3ddf529ec5d00c1bcc
This commit is contained in:
changbetty
2021-03-25 13:24:25 +08:00
parent 59aa4f9cb1
commit 8fcb1f5974
4 changed files with 94 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
View File

@@ -42,6 +42,7 @@ import android.net.NetworkInfo;
import android.net.NetworkRequest;
import android.net.RouteInfo;
import android.net.Uri;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
@@ -155,6 +156,8 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
static final String KEY_IPV6_CATEGORY = "ipv6_category";
@VisibleForTesting
static final String KEY_IPV6_ADDRESSES_PREF = "ipv6_addresses";
@VisibleForTesting
static final String KEY_WIFI_TYPE_PREF = "type";
private final WifiEntry mWifiEntry;
private final ConnectivityManager mConnectivityManager;
@@ -186,6 +189,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
private Preference mGatewayPref;
private Preference mSubnetPref;
private Preference mDnsPref;
private Preference mTypePref;
private PreferenceCategory mIpv6Category;
private Preference mIpv6AddressPref;
private Lifecycle mLifecycle;
@@ -382,6 +386,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
mGatewayPref = screen.findPreference(KEY_GATEWAY_PREF);
mSubnetPref = screen.findPreference(KEY_SUBNET_MASK_PREF);
mDnsPref = screen.findPreference(KEY_DNS_PREF);
mTypePref = screen.findPreference(KEY_WIFI_TYPE_PREF);
mIpv6Category = screen.findPreference(KEY_IPV6_CATEGORY);
mIpv6AddressPref = screen.findPreference(KEY_IPV6_ADDRESSES_PREF);
@@ -552,6 +557,8 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
refreshEapSimSubscription();
// MAC Address Pref
refreshMacAddress();
// Wifi Type
refreshWifiType();
}
private void refreshRssiViews() {
@@ -749,6 +756,36 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
}
}
private void refreshWifiType() {
final ConnectedInfo connectedInfo = mWifiEntry.getConnectedInfo();
if (connectedInfo == null) {
mTypePref.setVisible(false);
return;
}
final int typeString = getWifiStandardTypeString(connectedInfo.wifiStandard);
if (typeString != -1) {
mTypePref.setSummary(typeString);
mTypePref.setVisible(true);
} else {
mTypePref.setVisible(false);
}
}
private int getWifiStandardTypeString(int wifiStandardType) {
Log.d(TAG, "Wifi Type " + wifiStandardType);
switch (wifiStandardType) {
case ScanResult.WIFI_STANDARD_11AX:
return R.string.wifi_type_11AX;
case ScanResult.WIFI_STANDARD_11AC:
return R.string.wifi_type_11AC;
case ScanResult.WIFI_STANDARD_11N:
return R.string.wifi_type_11N;
default:
return -1;
}
}
private int getMacAddressTitle() {
if (mWifiEntry.getPrivacy() == WifiEntry.PRIVACY_RANDOMIZED_MAC) {
return mWifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED