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

Merge "Clean up Global settings stragglers." into jb-mr1-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2012-09-26 20:15:19 -07:00
committed by Android (Google) Code Review
parent 74c1d328e2 08aafd445f
commit 3db1413920
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ import android.preference.ListPreference;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.provider.Settings; import android.provider.Settings;
import android.provider.Settings.Secure; import android.provider.Settings.Global;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.widget.Toast; import android.widget.Toast;
@@ -80,15 +80,15 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
if (Utils.isWifiOnly(getActivity())) { if (Utils.isWifiOnly(getActivity())) {
getPreferenceScreen().removePreference(poorNetworkDetection); getPreferenceScreen().removePreference(poorNetworkDetection);
} else { } else {
poorNetworkDetection.setChecked(Secure.getInt(getContentResolver(), poorNetworkDetection.setChecked(Global.getInt(getContentResolver(),
Secure.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, 1) == 1); Global.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, 1) == 1);
} }
} }
CheckBoxPreference suspendOptimizations = CheckBoxPreference suspendOptimizations =
(CheckBoxPreference) findPreference(KEY_SUSPEND_OPTIMIZATIONS); (CheckBoxPreference) findPreference(KEY_SUSPEND_OPTIMIZATIONS);
suspendOptimizations.setChecked(Secure.getInt(getContentResolver(), suspendOptimizations.setChecked(Global.getInt(getContentResolver(),
Secure.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED, 1) == 1); Global.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED, 1) == 1);
ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND); ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);
@@ -147,16 +147,16 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
String key = preference.getKey(); String key = preference.getKey();
if (KEY_NOTIFY_OPEN_NETWORKS.equals(key)) { if (KEY_NOTIFY_OPEN_NETWORKS.equals(key)) {
Secure.putInt(getContentResolver(), Global.putInt(getContentResolver(),
Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
((CheckBoxPreference) preference).isChecked() ? 1 : 0); ((CheckBoxPreference) preference).isChecked() ? 1 : 0);
} else if (KEY_POOR_NETWORK_DETECTION.equals(key)) { } else if (KEY_POOR_NETWORK_DETECTION.equals(key)) {
Secure.putInt(getContentResolver(), Global.putInt(getContentResolver(),
Secure.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, Global.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED,
((CheckBoxPreference) preference).isChecked() ? 1 : 0); ((CheckBoxPreference) preference).isChecked() ? 1 : 0);
} else if (KEY_SUSPEND_OPTIMIZATIONS.equals(key)) { } else if (KEY_SUSPEND_OPTIMIZATIONS.equals(key)) {
Secure.putInt(getContentResolver(), Global.putInt(getContentResolver(),
Secure.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED, Global.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED,
((CheckBoxPreference) preference).isChecked() ? 1 : 0); ((CheckBoxPreference) preference).isChecked() ? 1 : 0);
} else { } else {
return super.onPreferenceTreeClick(screen, preference); return super.onPreferenceTreeClick(screen, preference);