diff options
author | Christopher Tate <ctate@google.com> | 2012-09-12 14:25:46 -0700 |
---|---|---|
committer | Christopher Tate <ctate@google.com> | 2012-09-12 14:25:46 -0700 |
commit | f1c085899dd3d9142392b9ab7841c0e9502526a3 (patch) | |
tree | 78e596a14f8c56585ed5ec6f8dc6fcc5cc8f27c3 /src/com/android/settings/DateTimeSettings.java | |
parent | fc76a78c458ac90d7e050ffc233cf9e32a2d9c0b (diff) | |
download | packages_apps_Settings-f1c085899dd3d9142392b9ab7841c0e9502526a3.zip packages_apps_Settings-f1c085899dd3d9142392b9ab7841c0e9502526a3.tar.gz packages_apps_Settings-f1c085899dd3d9142392b9ab7841c0e9502526a3.tar.bz2 |
Correct settings namespace for auto time/tz
Bug 7148283
Change-Id: If585b16f5b6ea3046e64eb9c8355fa3c9fbeeada
Diffstat (limited to 'src/com/android/settings/DateTimeSettings.java')
-rw-r--r-- | src/com/android/settings/DateTimeSettings.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index 30d4f0a..53f25a2 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -81,8 +81,8 @@ public class DateTimeSettings extends SettingsPreferenceFragment } private void initUI() { - boolean autoTimeEnabled = getAutoState(Settings.System.AUTO_TIME); - boolean autoTimeZoneEnabled = getAutoState(Settings.System.AUTO_TIME_ZONE); + boolean autoTimeEnabled = getAutoState(Settings.Global.AUTO_TIME); + boolean autoTimeZoneEnabled = getAutoState(Settings.Global.AUTO_TIME_ZONE); Intent intent = getActivity().getIntent(); boolean isFirstRun = intent.getBooleanExtra(EXTRA_IS_FIRST_RUN, false); @@ -214,14 +214,14 @@ public class DateTimeSettings extends SettingsPreferenceFragment updateTimeAndDateDisplay(getActivity()); } else if (key.equals(KEY_AUTO_TIME)) { boolean autoEnabled = preferences.getBoolean(key, true); - Settings.System.putInt(getContentResolver(), Settings.System.AUTO_TIME, + Settings.Global.putInt(getContentResolver(), Settings.Global.AUTO_TIME, autoEnabled ? 1 : 0); mTimePref.setEnabled(!autoEnabled); mDatePref.setEnabled(!autoEnabled); } else if (key.equals(KEY_AUTO_TIME_ZONE)) { boolean autoZoneEnabled = preferences.getBoolean(key, true); - Settings.System.putInt( - getContentResolver(), Settings.System.AUTO_TIME_ZONE, autoZoneEnabled ? 1 : 0); + Settings.Global.putInt( + getContentResolver(), Settings.Global.AUTO_TIME_ZONE, autoZoneEnabled ? 1 : 0); mTimeZone.setEnabled(!autoZoneEnabled); } } @@ -331,7 +331,7 @@ public class DateTimeSettings extends SettingsPreferenceFragment private boolean getAutoState(String name) { try { - return Settings.System.getInt(getContentResolver(), name) > 0; + return Settings.Global.getInt(getContentResolver(), name) > 0; } catch (SettingNotFoundException snfe) { return false; } |