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

Merge "Displays frequency on connected WiFi network info. Bug: 12767819"

Browse Source
This commit is contained in:
Felipe Leme
2014-03-14 22:42:05 +00:00
committed by Android (Google) Code Review
parent 99fb0e9e59 f8d798631b
commit bc64d5030e
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -1437,6 +1437,8 @@
<string name="wifi_status">Status</string>
<!-- Label for the link speed of the connection -->
<string name="wifi_speed">Link speed</string>
<!-- Label for the frequency band of the connection -->
<string name="wifi_frequency">Frequency</string>
<!-- Label for the IP address of the connection -->
<string name="wifi_ip_address">IP address</string>
<!-- Hint text for the IP address -->

16
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -218,6 +218,22 @@ public class WifiConfigController implements TextWatcher,
if (info != null && info.getLinkSpeed() != -1) {
addRow(group, R.string.wifi_speed, info.getLinkSpeed() + WifiInfo.LINK_SPEED_UNITS);
}
if (info != null && info.getFrequency() != -1) {
// Since the frequency is defined on MHz, we need to simplify it
// to just 2.4GHz (regardless of the locale) or 5GHz.
int frequency = info.getFrequency();
String band = null;
if (frequency >= 2400 && frequency < 2500) {
band = "2.4GHz";
} else if (frequency >= 5000 && frequency < 6000) {
band = "5GHz";
} else {
Log.e(TAG, "Unexpected frequency " + frequency);
}
if (band != null) {
addRow(group, R.string.wifi_frequency, band);
}
}
addRow(group, R.string.wifi_security, mAccessPoint.getSecurityString(false));