diff --git a/res/values/strings.xml b/res/values/strings.xml index 9d100314741..1db67706865 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1346,9 +1346,11 @@ Operating channel - 2.4GHz + 2.4 GHz - 5GHz + 5 GHz + + %1$d Mbps %1$s manages your device and has disabled modifying and deleting this Wi-Fi network. For more information, contact your administrator. diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 3b5c58df39d..d183546f4a6 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -271,8 +271,8 @@ public class WifiConfigController implements TextWatcher, WifiInfo info = mAccessPoint.getInfo(); if (info != null && info.getLinkSpeed() != -1) { - addRow(group, R.string.wifi_speed, info.getLinkSpeed() - + WifiInfo.LINK_SPEED_UNITS); + addRow(group, R.string.wifi_speed, String.format( + res.getString(R.string.link_speed), info.getLinkSpeed())); } if (info != null && info.getFrequency() != -1) {