diff options
author | Amith Yamasani <yamasani@google.com> | 2012-11-01 08:44:46 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-01 08:44:46 -0700 |
commit | 797d620084df296b1d1d3e3c03d519fdf916f2d3 (patch) | |
tree | a571afc557d93561dba37058bd84bff69ff964f4 /src/com/android/settings/DateTimeSettings.java | |
parent | bfb645050356fa854da6adbd9091454ad4376c21 (diff) | |
parent | f9a2f324d70cdbb4b0786f868ae01f99fe2734fb (diff) | |
download | packages_apps_Settings-797d620084df296b1d1d3e3c03d519fdf916f2d3.zip packages_apps_Settings-797d620084df296b1d1d3e3c03d519fdf916f2d3.tar.gz packages_apps_Settings-797d620084df296b1d1d3e3c03d519fdf916f2d3.tar.bz2 |
am f9a2f324: Merge "Changed the way that date format selector is shown."
* commit 'f9a2f324d70cdbb4b0786f868ae01f99fe2734fb':
Changed the way that date format selector is shown.
Diffstat (limited to 'src/com/android/settings/DateTimeSettings.java')
-rw-r--r-- | src/com/android/settings/DateTimeSettings.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index 53f25a2..98c3887 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -118,6 +118,10 @@ public class DateTimeSettings extends SettingsPreferenceFragment if (currentFormat == null) { currentFormat = ""; } + + // Prevents duplicated values on date format selector. + mDummyDate.set(mDummyDate.get(Calendar.YEAR), mDummyDate.DECEMBER, 31, 13, 0, 0); + for (int i = 0; i < formattedDates.length; i++) { String formatted = DateFormat.getDateFormatForSetting(getActivity(), dateFormats[i]) |