diff options
| author | Irfan Sheriff <isheriff@android.com> | 2012-07-03 12:18:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-03 12:18:33 -0700 |
| commit | 7c8363eb11b61f712e982b161a2267c2731df6fa (patch) | |
| tree | b6b62bb82580a06e7af8c2732dfb017b9844c6b6 | |
| parent | df833bea374429922d6d7629a5ab498e3e10f8dd (diff) | |
| parent | d80ff0a4d615bd6f037483bf9dc2b10887d9507f (diff) | |
| download | packages_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
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | src/com/android/settings/wifi/WifiApEnabler.java | 4 |
2 files changed, 6 insertions, 2 deletions
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 @@ 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: |