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

Merge "Fixing Wifi strings and pref ordering per ui"

Browse Source
This commit is contained in:
Irfan Sheriff
2011-08-24 13:33:13 -07:00
committed by Android (Google) Code Review
parent e681a91d3e 5070e45a87
commit a796598ff9
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -1135,9 +1135,9 @@
<!-- Checkbox summary for option to notify user when open networks are nearby --> <!-- 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> <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 --> <!-- 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 --> <!-- 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 --> <!-- Setting title for setting the wifi sleep policy -->
<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 -->
@@ -1219,7 +1219,7 @@
<!-- Status for networks disabled for unknown reason --> <!-- Status for networks disabled for unknown reason -->
<string name="wifi_disabled_generic">Disabled</string> <string name="wifi_disabled_generic">Disabled</string>
<!-- Status for networked disabled from a DNS or DHCP failure --> <!-- 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 <!-- Status for networks disabled from authentication failure (wrong password
or certificate). --> or certificate). -->
<string name="wifi_disabled_password_failure">Authentication problem</string> <string name="wifi_disabled_password_failure">Authentication problem</string>

14
res/xml/wifi_advanced_settings.xml
View File

@@ -24,13 +24,6 @@
android:summary="@string/wifi_notify_open_networks_summary" android:summary="@string/wifi_notify_open_networks_summary"
android:persistent="false" /> 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 <ListPreference
android:key="sleep_policy" android:key="sleep_policy"
android:title="@string/wifi_setting_sleep_policy_title" android:title="@string/wifi_setting_sleep_policy_title"
@@ -40,6 +33,13 @@
android:entryValues="@array/wifi_sleep_policy_values" 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 <ListPreference
android:key="frequency_band" android:key="frequency_band"
android:title="@string/wifi_setting_frequency_band_title" android:title="@string/wifi_setting_frequency_band_title"

2
src/com/android/settings/wifi/AdvancedWifiSettings.java
View File

@@ -78,8 +78,6 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
watchdogEnabled.setChecked(Secure.getInt(getContentResolver(), watchdogEnabled.setChecked(Secure.getInt(getContentResolver(),
Secure.WIFI_WATCHDOG_ON, 1) == 1); Secure.WIFI_WATCHDOG_ON, 1) == 1);
watchdogEnabled.setEnabled(mWifiManager.isWifiEnabled());
ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND); ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);
if (mWifiManager.isDualBandSupported()) { if (mWifiManager.isDualBandSupported()) {