diff options
| author | Isaac Levy <ilevy@google.com> | 2011-08-24 11:37:39 -0700 |
|---|---|---|
| committer | Isaac Levy <ilevy@google.com> | 2011-08-24 11:37:39 -0700 |
| commit | 5070e45a8799674f27bb087631c1377f5256b93f (patch) | |
| tree | 14b620bd7c0cb69f3249ee822a546f9dc952f886 /res | |
| parent | 778e5240ee39d215fcddadbd2e6f4e2bbb0ec2ac (diff) | |
| download | packages_apps_Settings-5070e45a8799674f27bb087631c1377f5256b93f.tar.gz packages_apps_Settings-5070e45a8799674f27bb087631c1377f5256b93f.tar.bz2 packages_apps_Settings-5070e45a8799674f27bb087631c1377f5256b93f.zip | |
Fixing Wifi strings and pref ordering per ui
- also no longer disabling wifi_watchdog toggle when radio is off.
Change-Id: Ic52249afd619028fe2765f434ee166f3d36e14fd
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | res/xml/wifi_advanced_settings.xml | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 8b305370f..88c9a06d5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1135,9 +1135,9 @@ <!-- Checkbox summary for option to notify user when open networks are nearby --> <string name="wifi_notify_open_networks_summary">Notify me when an open network is available</string> <!-- Checkbox title for option to toggle wifi watchdog service --> - <string name="wifi_enable_watchdog_service">Wi-Fi Connectivity Checks</string> + <string name="wifi_enable_watchdog_service">Avoid poor connections</string> <!-- Checkbox summary for option to toggle wifi watchdog service --> - <string name="wifi_enable_watchdog_service_summary">Detect and manage potential network connectivity problems</string> + <string name="wifi_enable_watchdog_service_summary">Don\'t use a Wi-Fi network unless it has a decent internet connection</string> <!-- Setting title for setting the wifi sleep policy --> <string name="wifi_setting_sleep_policy_title">Wi-Fi disconnect policy</string> <!-- Setting summary for setting the wifi sleep policy --> @@ -1219,7 +1219,7 @@ <!-- Status for networks disabled for unknown reason --> <string name="wifi_disabled_generic">Disabled</string> <!-- Status for networked disabled from a DNS or DHCP failure --> - <string name="wifi_disabled_network_failure">Avoided poor connection</string> + <string name="wifi_disabled_network_failure">Avoided poor internet connection</string> <!-- Status for networks disabled from authentication failure (wrong password or certificate). --> <string name="wifi_disabled_password_failure">Authentication problem</string> diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml index d7344b10d..c9cc88489 100644 --- a/res/xml/wifi_advanced_settings.xml +++ b/res/xml/wifi_advanced_settings.xml @@ -24,13 +24,6 @@ android:summary="@string/wifi_notify_open_networks_summary" android:persistent="false" /> - <!-- android:dependency="enable_wifi" --> - <CheckBoxPreference - android:key="wifi_enable_watchdog_service" - android:title="@string/wifi_enable_watchdog_service" - android:summary="@string/wifi_enable_watchdog_service_summary" - android:persistent="false" /> - <ListPreference android:key="sleep_policy" android:title="@string/wifi_setting_sleep_policy_title" @@ -40,6 +33,13 @@ android:entryValues="@array/wifi_sleep_policy_values" /> + <!-- android:dependency="enable_wifi" --> + <CheckBoxPreference + android:key="wifi_enable_watchdog_service" + android:title="@string/wifi_enable_watchdog_service" + android:summary="@string/wifi_enable_watchdog_service_summary" + android:persistent="false" /> + <ListPreference android:key="frequency_band" android:title="@string/wifi_setting_frequency_band_title" |