Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12285f3d authored by Elliott Hughes's avatar Elliott Hughes
Browse files

DateUtils should use the user's 12/24-hour preference, not the locale's. 

Bug: 10312832

(cherry picked from commit f0b79aee)

Change-Id: I0d78725d47009553f9003ccfba06f70f178a6ec1
parent 66a83ae6

core/java/android/text/format/DateUtils.java

+7 −1
Original line number Diff line number Diff line
@@ -816,6 +816,12 @@ public class DateUtils 
     */

    public static Formatter formatDateRange(Context context, Formatter formatter, long startMillis,

                                            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);