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

Commit 64a1a901 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 87ce99ca: am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24." 

* commit '87ce99ca':
  Migrate off timeFormat12 and timeFormat24.
parents 177f91d1 87ce99ca

core/java/android/text/format/DateFormat.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -216,7 +216,7 @@ public class DateFormat { 
     */

     */

    public static String getTimeFormatString(Context context) {

    public static String getTimeFormatString(Context context) {

        LocaleData d = LocaleData.get(context.getResources().getConfiguration().locale);

        LocaleData d = LocaleData.get(context.getResources().getConfiguration().locale);

        return is24HourFormat(context) ? d.timeFormat24 : d.timeFormat12;

        return is24HourFormat(context) ? d.timeFormat_Hm : d.timeFormat_hm;

    }

    }





    /**

    /**

core/java/android/widget/TextClock.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -226,10 +226,10 @@ public class TextClock extends TextView { 
        if (mFormat12 == null || mFormat24 == null) {

        if (mFormat12 == null || mFormat24 == null) {

            LocaleData ld = LocaleData.get(getContext().getResources().getConfiguration().locale);

            LocaleData ld = LocaleData.get(getContext().getResources().getConfiguration().locale);

            if (mFormat12 == null) {

            if (mFormat12 == null) {

                mFormat12 = ld.timeFormat12;

                mFormat12 = ld.timeFormat_hm;

            }

            }

            if (mFormat24 == null) {

            if (mFormat24 == null) {

                mFormat24 = ld.timeFormat24;

                mFormat24 = ld.timeFormat_Hm;

            }

            }

        }

        }
@@ -433,9 +433,9 @@ public class TextClock extends TextView { 
        LocaleData ld = LocaleData.get(getContext().getResources().getConfiguration().locale);

        LocaleData ld = LocaleData.get(getContext().getResources().getConfiguration().locale);





        if (format24Requested) {

        if (format24Requested) {

            mFormat = abc(mFormat24, mFormat12, ld.timeFormat24);

            mFormat = abc(mFormat24, mFormat12, ld.timeFormat_Hm);

        } else {

        } else {

            mFormat = abc(mFormat12, mFormat24, ld.timeFormat12);

            mFormat = abc(mFormat12, mFormat24, ld.timeFormat_hm);

        }

        }





        boolean hadSeconds = mHasSeconds;

        boolean hadSeconds = mHasSeconds;

packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -149,7 +149,7 @@ public class Clock extends TextView implements DemoMode { 
        final char MAGIC2 = '\uEF01';

        final char MAGIC2 = '\uEF01';





        SimpleDateFormat sdf;

        SimpleDateFormat sdf;

        String format = is24 ? d.timeFormat24 : d.timeFormat12;

        String format = is24 ? d.timeFormat_Hm : d.timeFormat_hm;

        if (!format.equals(mClockFormatString)) {

        if (!format.equals(mClockFormatString)) {

            /*

            /*

             * Search for an unquoted "a" in the format string, so we can

             * Search for an unquoted "a" in the format string, so we can