summaryrefslogtreecommitdiffstats
path: root/src/com/android/deskclock/DigitalClock.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/deskclock/DigitalClock.java')
-rw-r--r--src/com/android/deskclock/DigitalClock.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/deskclock/DigitalClock.java b/src/com/android/deskclock/DigitalClock.java
index d28cc7de7..383ca7b02 100644
--- a/src/com/android/deskclock/DigitalClock.java
+++ b/src/com/android/deskclock/DigitalClock.java
@@ -68,7 +68,9 @@ public class DigitalClock extends LinearLayout {
AmPm(View parent, Typeface tf) {
mAmPm = (TextView) parent.findViewById(R.id.am_pm);
- mAmPm.setTypeface(tf);
+ if (tf != null) {
+ mAmPm.setTypeface(tf);
+ }
String[] ampm = new DateFormatSymbols().getAmPmStrings();
mAmString = ampm[0];
@@ -111,7 +113,7 @@ public class DigitalClock extends LinearLayout {
"fonts/Clockopia.ttf");
mTimeDisplay = (TextView) findViewById(R.id.timeDisplay);
mTimeDisplay.setTypeface(tf);
- mAmPm = new AmPm(this, tf);
+ mAmPm = new AmPm(this, null);
mCalendar = Calendar.getInstance();
setDateFormat();