summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/wifi
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@android.com>2012-07-03 12:18:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-03 12:18:33 -0700
commit7c8363eb11b61f712e982b161a2267c2731df6fa (patch)
treeb6b62bb82580a06e7af8c2732dfb017b9844c6b6 /src/com/android/settings/wifi
parentdf833bea374429922d6d7629a5ab498e3e10f8dd (diff)
parentd80ff0a4d615bd6f037483bf9dc2b10887d9507f (diff)
downloadpackages_apps_settings-7c8363eb11b61f712e982b161a2267c2731df6fa.zip
packages_apps_settings-7c8363eb11b61f712e982b161a2267c2731df6fa.tar.gz
packages_apps_settings-7c8363eb11b61f712e982b161a2267c2731df6fa.tar.bz2
am d80ff0a4: Merge "wifi: update text displayed during hotspot on/off"
* commit 'd80ff0a4d615bd6f037483bf9dc2b10887d9507f': wifi: update text displayed during hotspot on/off
Diffstat (limited to 'src/com/android/settings/wifi')
-rw-r--r--src/com/android/settings/wifi/WifiApEnabler.java4
1 files changed, 2 insertions, 2 deletions
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 @@ 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: