From 151b0e117443d874c475d25f7144bba1e1b438ef Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Sun, 12 Jun 2011 19:44:14 -0700 Subject: [PATCH] Change dummy calendar setting during locale change If the timezone changed too far, the example date would be "1/1/yyyy+1" instead of "12/31/yyyy" Move the setting of the Calendar time to where the string is calculated to make sure we have the most up-to-date Locale. Bug: 4596841 Change-Id: I67a253a65b1ea03ee717945c5df819beb8515662 --- src/com/android/settings/DateTimeSettings.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index d2c5973ffe0..31e6a3348f5 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -88,7 +88,6 @@ public class DateTimeSettings extends SettingsPreferenceFragment boolean isFirstRun = intent.getBooleanExtra(EXTRA_IS_FIRST_RUN, false); mDummyDate = Calendar.getInstance(); - mDummyDate.set(mDummyDate.get(Calendar.YEAR), 11, 31, 13, 0, 0); mAutoTimePref = (CheckBoxPreference) findPreference(KEY_AUTO_TIME); mAutoTimePref.setChecked(autoTimeEnabled); @@ -171,6 +170,8 @@ public class DateTimeSettings extends SettingsPreferenceFragment public void updateTimeAndDateDisplay(Context context) { java.text.DateFormat shortDateFormat = DateFormat.getDateFormat(context); final Calendar now = Calendar.getInstance(); + mDummyDate.setTimeZone(now.getTimeZone()); + mDummyDate.set(now.get(Calendar.YEAR), 11, 31, 13, 0, 0); Date dummyDate = mDummyDate.getTime(); mTimePref.setSummary(DateFormat.getTimeFormat(getActivity()).format(now.getTime())); mTimeZone.setSummary(getTimeZoneText(now.getTimeZone()));