diff options
author | Kenny Root <kroot@google.com> | 2011-06-12 19:44:14 -0700 |
---|---|---|
committer | Kenny Root <kroot@google.com> | 2011-06-12 20:54:53 -0700 |
commit | 151b0e117443d874c475d25f7144bba1e1b438ef (patch) | |
tree | 16027730ca1ac8ca4add09087cbe5bdab1775430 /src/com/android/settings/DateTimeSettings.java | |
parent | 8a50364a71e7c261b54840210f8bacff5abecb34 (diff) | |
download | packages_apps_Settings-151b0e117443d874c475d25f7144bba1e1b438ef.zip packages_apps_Settings-151b0e117443d874c475d25f7144bba1e1b438ef.tar.gz packages_apps_Settings-151b0e117443d874c475d25f7144bba1e1b438ef.tar.bz2 |
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
Diffstat (limited to 'src/com/android/settings/DateTimeSettings.java')
-rw-r--r-- | src/com/android/settings/DateTimeSettings.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index d2c5973..31e6a33 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())); |