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

am 547089c3: Merge "Fix wifi network strings shown in Settings." into mnc-dev

Browse Source 
* commit '547089c3768f3266a1f18e6d1f42a81aeb0b3bcf':
  Fix wifi network strings shown in Settings.
This commit is contained in:
Sanket Padawe
2015-06-06 02:09:10 +00:00
committed by Android Git Automerger
parent bf4938166f 547089c376
commit ca324f5abf
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -1346,9 +1346,11 @@
<!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] -->
<string name="wifi_display_operating_channel" translatable="false">Operating channel</string>
<!-- Wifi 2.4GHz is used as an universal itendifier for 2.4GHz band -->
<string name="wifi_band_24ghz" translatable="false">2.4GHz</string>
<string name="wifi_band_24ghz">2.4 GHz</string>
<!-- Wifi Internal 5GHz as an universal itendifier for 5GHz band -->
<string name="wifi_band_5ghz" translatable="false">5GHz</string>
<string name="wifi_band_5ghz">5 GHz</string>
<!-- Link speed on Wifi Status screen -->
<string name="link_speed">%1$d Mbps</string>
<!-- Wifi Alert message when tapping on a preference for a config locked down by device owner. [CHAR LIMIT=200] -->
<string name="wifi_alert_lockdown_by_device_owner"><xliff:g id="app_name">%1$s</xliff:g> manages your device and has disabled modifying and deleting this Wi-Fi network. For more information, contact your administrator.</string>

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

@@ -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) {