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

am 1ad4824d: am 35bc6b5f: Wifi disconnect policy summary text should not contain "mobile data".

Browse Source 
* commit '1ad4824d848d67e185f06b4fdce86f1caeb0d95e':
  Wifi disconnect policy summary text should not contain "mobile data".
This commit is contained in:
Amith Yamasani
2011-03-08 13:51:52 -08:00
committed by Android Git Automerger
parent 0da4ec4981 1ad4824d84
commit cb84ad529d
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -1050,6 +1050,8 @@
<string name="wifi_setting_sleep_policy_title">Wi-Fi disconnect policy</string> <string name="wifi_setting_sleep_policy_title">Wi-Fi disconnect policy</string>
<!-- Setting summary for setting the wifi sleep policy --> <!-- Setting summary for setting the wifi sleep policy -->
<string name="wifi_setting_sleep_policy_summary">Specify when to switch from Wi-Fi to mobile data</string> <string name="wifi_setting_sleep_policy_summary">Specify when to switch from Wi-Fi to mobile data</string>
<!-- Setting summary for setting the wifi sleep policy for wifi-only devices [CHAR LIMIT=100] -->
<string name="wifi_setting_sleep_policy_summary_wifi_only">Specify when to disconnect from Wi-Fi</string>
<!-- Generic error message when the sleep policy could not be set. --> <!-- Generic error message when the sleep policy could not be set. -->
<string name="wifi_setting_sleep_policy_error">There was a problem changing the setting</string> <string name="wifi_setting_sleep_policy_error">There was a problem changing the setting</string>
<!-- Action message to manually add a wifi network --> <!-- Action message to manually add a wifi network -->

1
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -218,6 +218,7 @@ public class WifiSettings extends SettingsPreferenceFragment
if (pref != null) { if (pref != null) {
if (Utils.isWifiOnly()) { if (Utils.isWifiOnly()) {
pref.setEntries(R.array.wifi_sleep_policy_entries_wifi_only); pref.setEntries(R.array.wifi_sleep_policy_entries_wifi_only);
pref.setSummary(R.string.wifi_setting_sleep_policy_summary_wifi_only);
} }
pref.setOnPreferenceChangeListener(this); pref.setOnPreferenceChangeListener(this);
int value = Settings.System.getInt(getContentResolver(), int value = Settings.System.getInt(getContentResolver(),