Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
parent 0010e80304 730f0b238a
commit b3a82ebd6e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/widget/DigitalClock.java
View File

@@ -129,7 +129,7 @@ public class DigitalClock extends RelativeLayout {
mTimeDisplayBackground.setTypeface(Typeface.createFromFile(SYSTEM_FONT_TIME_BACKGROUND)); mTimeDisplayBackground.setTypeface(Typeface.createFromFile(SYSTEM_FONT_TIME_BACKGROUND));
mTimeDisplayForeground = (TextView) findViewById(R.id.timeDisplayForeground); mTimeDisplayForeground = (TextView) findViewById(R.id.timeDisplayForeground);
mTimeDisplayForeground.setTypeface(Typeface.createFromFile(SYSTEM_FONT_TIME_FOREGROUND)); 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(); mCalendar = Calendar.getInstance();
setDateFormat(); setDateFormat();