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

This commit is contained in:
Jim Miller
2011-01-09 16:08:58 -08:00
committed by Android (Google) Code Review

View File

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