Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 82461951: Merge "DateUtils should use the user\'s 12/24-hour preference, not the locale\'s."

Browse Source 
* commit '82461951c3bddd5e6873dbb66703b838cbb66b2c':
  DateUtils should use the user's 12/24-hour preference, not the locale's.
This commit is contained in:
Elliott Hughes
2013-08-14 15:30:02 -07:00
committed by Android Git Automerger
parent 5adfb21e3a 82461951c3
commit 8a19606599
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/text/format/DateUtils.java
View File

@@ -815,7 +815,13 @@ public class DateUtils
* @return the formatter with the formatted date/time range appended to the string buffer.
*/
public static Formatter formatDateRange(Context context, Formatter formatter, long startMillis,
long endMillis, int flags, String timeZone) {
long endMillis, int flags, String timeZone) {
// icu4c will fall back to the locale's preferred 12/24 format,
// but we want to fall back to the user's preference.
if ((flags & (FORMAT_12HOUR | FORMAT_24HOUR)) == 0) {
flags |= DateFormat.is24HourFormat(context) ? FORMAT_24HOUR : FORMAT_12HOUR;
}
String range = DateIntervalFormat.formatDateRange(startMillis, endMillis, flags, timeZone);
try {
formatter.out().append(range);