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

Stop hard-coding sample 12- and 24-hour times.

Browse Source 
Bug: 6881640
Change-Id: I6b0d6404b0299f9efa8fd12779799f703f1c764f
This commit is contained in:
Elliott Hughes
2012-09-06 14:49:35 -07:00
parent 2d6b52bd38
commit 82723df002
52 changed files with 4 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,12 +171,15 @@ public class DateTimeSettings extends SettingsPreferenceFragment
java.text.DateFormat shortDateFormat = DateFormat.getDateFormat(context);
final Calendar now = Calendar.getInstance();
mDummyDate.setTimeZone(now.getTimeZone());
// We use December 31st because it's unambiguous when demonstrating the date format.
// We use 13:00 so we can demonstrate the 12/24 hour options.
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()));
mDatePref.setSummary(shortDateFormat.format(now.getTime()));
mDateFormat.setSummary(shortDateFormat.format(dummyDate));
mTime24Pref.setSummary(DateFormat.getTimeFormat(getActivity()).format(dummyDate));
}
@Override