am d80ff0a4: Merge "wifi: update text displayed during hotspot on/off"
* commit 'd80ff0a4d615bd6f037483bf9dc2b10887d9507f':
wifi: update text displayed during hotspot on/off
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c311114..2371b4a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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 -->
diff --git a/src/com/android/settings/wifi/WifiApEnabler.java b/src/com/android/settings/wifi/WifiApEnabler.java
index 92e1c92..86a7cb4 100644
--- a/src/com/android/settings/wifi/WifiApEnabler.java
+++ b/src/com/android/settings/wifi/WifiApEnabler.java
@@ -180,7 +180,7 @@
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 @@
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: