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

* commit '730f0b238a20362ff0ae6bdfbd069f0996fc1b39':
  Fix 3299611: Use system font for AM/PM indicator
This commit is contained in:
Jim Miller
2011-01-09 16:10:19 -08:00
committed by Android Git Automerger

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