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

Merge "Correct settings namespace for auto time/tz" into jb-mr1-dev

Browse Source
This commit is contained in:
Christopher Tate
2012-09-12 14:30:35 -07:00
committed by Android (Google) Code Review
parent 01bd0f0017 f1c085899d
commit 4a596b19eb
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/DateTimeSettings.java
View File

@@ -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;
}

16
src/com/android/settings/DateTimeSettingsSetupWizard.java
View File

@@ -185,7 +185,7 @@ public class DateTimeSettingsSetupWizard extends Activity
}
}
if (mAutoDateTimeButton != null) {
Settings.System.putInt(getContentResolver(), Settings.System.AUTO_TIME,
Settings.Global.putInt(getContentResolver(), Settings.Global.AUTO_TIME,
mAutoDateTimeButton.isChecked() ? 1 : 0);
if (!mAutoDateTimeButton.isChecked()) {
DateTimeSettings.setDate(mDatePicker.getYear(), mDatePicker.getMonth(),
@@ -209,8 +209,8 @@ public class DateTimeSettingsSetupWizard extends Activity
/*if (buttonView == mAutoTimeZoneButton) {
// In XL screen, we save all the state only when the next button is pressed.
if (!mUsingXLargeLayout) {
Settings.System.putInt(getContentResolver(),
Settings.System.AUTO_TIME_ZONE,
Settings.Global.putInt(getContentResolver(),
Settings.Global.AUTO_TIME_ZONE,
isChecked ? 1 : 0);
}
mTimeZone.setEnabled(!autoEnabled);
@@ -220,8 +220,8 @@ public class DateTimeSettingsSetupWizard extends Activity
}
} else */
if (buttonView == mAutoDateTimeButton) {
Settings.System.putInt(getContentResolver(),
Settings.System.AUTO_TIME,
Settings.Global.putInt(getContentResolver(),
Settings.Global.AUTO_TIME,
isChecked ? 1 : 0);
mTimePicker.setEnabled(!autoEnabled);
mDatePicker.setEnabled(!autoEnabled);
@@ -296,7 +296,7 @@ public class DateTimeSettingsSetupWizard extends Activity
private boolean isAutoDateTimeEnabled() {
try {
return Settings.System.getInt(getContentResolver(), Settings.System.AUTO_TIME) > 0;
return Settings.Global.getInt(getContentResolver(), Settings.Global.AUTO_TIME) > 0;
} catch (SettingNotFoundException e) {
return true;
}
@@ -305,8 +305,8 @@ public class DateTimeSettingsSetupWizard extends Activity
/*
private boolean isAutoTimeZoneEnabled() {
try {
return Settings.System.getInt(getContentResolver(),
Settings.System.AUTO_TIME_ZONE) > 0;
return Settings.Global.getInt(getContentResolver(),
Settings.Global.AUTO_TIME_ZONE) > 0;
} catch (SettingNotFoundException e) {
return true;
}