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

Commit 730f0b23 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix 3299611: Use system font for AM/PM indicator" into honeycomb

parents edca0e4d 81f9b286

core/java/com/android/internal/widget/DigitalClock.java

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ public class DigitalClock extends RelativeLayout { 
        mTimeDisplayBackground.setTypeface(Typeface.createFromFile(SYSTEM_FONT_TIME_BACKGROUND));

        mTimeDisplayForeground = (TextView) findViewById(R.id.timeDisplayForeground);

        mTimeDisplayForeground.setTypeface(Typeface.createFromFile(SYSTEM_FONT_TIME_FOREGROUND));

        mAmPm = new AmPm(this, Typeface.createFromFile(SYSTEM_FONT_TIME_BACKGROUND));

        mAmPm = new AmPm(this, null);

        mCalendar = Calendar.getInstance();



        setDateFormat();