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

am d80ff0a4: Merge "wifi: update text displayed during hotspot on/off"

Browse Source 
* commit 'd80ff0a4d615bd6f037483bf9dc2b10887d9507f':
  wifi: update text displayed during hotspot on/off
This commit is contained in:
Irfan Sheriff
2012-07-03 12:18:33 -07:00
committed by Android Git Automerger
parent df833bea37 d80ff0a4d6
commit 7c8363eb11
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -1451,6 +1451,10 @@
<!-- Wifi AP settings-->
<!-- Label for wifi tether checkbox. Toggles Access Point on/off -->
<string name="wifi_tether_checkbox_text">Portable Wi-Fi hotspot</string>
<!-- Summary text when turning hotspot on -->
<string name="wifi_tether_starting">Turning hotspot on\u2026</string>
<!-- Summary text when turning hotspot off -->
<string name="wifi_tether_stopping">Turning off hotspot\u2026</string>
<!-- Subtext for wifi tether checkbox on success -->
<string name="wifi_tether_enabled_subtext">Portable hotspot <xliff:g id="network_ssid">%1$s</xliff:g> active</string>
<!-- Subtext for wifi tether checkbox on failure -->

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

@@ -180,7 +180,7 @@ public class WifiApEnabler {
private void handleWifiApStateChanged(int state) {
switch (state) {
case WifiManager.WIFI_AP_STATE_ENABLING:
mCheckBox.setSummary(R.string.wifi_starting);
mCheckBox.setSummary(R.string.wifi_tether_starting);
mCheckBox.setEnabled(false);
break;
case WifiManager.WIFI_AP_STATE_ENABLED:
@@ -193,7 +193,7 @@ public class WifiApEnabler {
mCheckBox.setEnabled(true);
break;
case WifiManager.WIFI_AP_STATE_DISABLING:
mCheckBox.setSummary(R.string.wifi_stopping);
mCheckBox.setSummary(R.string.wifi_tether_stopping);
mCheckBox.setEnabled(false);
break;
case WifiManager.WIFI_AP_STATE_DISABLED: