From 08aafd445f3df27efc574896ab490e0d399e9d17 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Wed, 26 Sep 2012 17:11:43 -0700 Subject: [PATCH] Clean up Global settings stragglers. Bug: 7242121 Change-Id: Ibe62c70f88c946e46a0604a6999b5ca18ac18a1e --- .../android/settings/wifi/AdvancedWifiSettings.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java index ac664e26fa..e02d4d7f11 100644 --- a/src/com/android/settings/wifi/AdvancedWifiSettings.java +++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java @@ -25,7 +25,7 @@ import android.preference.ListPreference; import android.preference.Preference; import android.preference.PreferenceScreen; import android.provider.Settings; -import android.provider.Settings.Secure; +import android.provider.Settings.Global; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; @@ -80,15 +80,15 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment if (Utils.isWifiOnly(getActivity())) { getPreferenceScreen().removePreference(poorNetworkDetection); } else { - poorNetworkDetection.setChecked(Secure.getInt(getContentResolver(), - Secure.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, 1) == 1); + poorNetworkDetection.setChecked(Global.getInt(getContentResolver(), + Global.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, 1) == 1); } } CheckBoxPreference suspendOptimizations = (CheckBoxPreference) findPreference(KEY_SUSPEND_OPTIMIZATIONS); - suspendOptimizations.setChecked(Secure.getInt(getContentResolver(), - Secure.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED, 1) == 1); + suspendOptimizations.setChecked(Global.getInt(getContentResolver(), + Global.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED, 1) == 1); ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND); @@ -147,16 +147,16 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment String key = preference.getKey(); if (KEY_NOTIFY_OPEN_NETWORKS.equals(key)) { - Secure.putInt(getContentResolver(), + Global.putInt(getContentResolver(), Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, ((CheckBoxPreference) preference).isChecked() ? 1 : 0); } else if (KEY_POOR_NETWORK_DETECTION.equals(key)) { - Secure.putInt(getContentResolver(), - Secure.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, + Global.putInt(getContentResolver(), + Global.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, ((CheckBoxPreference) preference).isChecked() ? 1 : 0); } else if (KEY_SUSPEND_OPTIMIZATIONS.equals(key)) { - Secure.putInt(getContentResolver(), - Secure.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED, + Global.putInt(getContentResolver(), + Global.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED, ((CheckBoxPreference) preference).isChecked() ? 1 : 0); } else { return super.onPreferenceTreeClick(screen, preference); -- 2.11.0