Merge "Fix wifi network strings shown in Settings." into mnc-dev

2015-06-06 01:58:18 +00:00
parent e35df2ff3b 2816e4e3e0
commit 547089c376
2 changed files with 6 additions and 4 deletions
--- 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) {