From 439d5bd5995ad6d9c0e750678a7c2176e2e1d67b Mon Sep 17 00:00:00 2001 From: Patrick Scott Date: Tue, 14 Jul 2009 08:50:14 -0400 Subject: [PATCH] Change the time format to show 2 digits for 24-hour mode. This will show 09 instead of 9 for all hours before 10 am. --- src/com/android/alarmclock/Alarms.java | 13 +++++++------ src/com/android/alarmclock/DigitalClock.java | 3 +-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/android/alarmclock/Alarms.java b/src/com/android/alarmclock/Alarms.java index e34b1b5..8e71836 100644 --- a/src/com/android/alarmclock/Alarms.java +++ b/src/com/android/alarmclock/Alarms.java @@ -40,20 +40,21 @@ import java.text.DateFormatSymbols; */ public class Alarms { - public final static String ALARM_ALERT_ACTION = "com.android.alarmclock.ALARM_ALERT"; - public final static String ID = "alarm_id"; - public final static String TIME = "alarm_time"; - public final static String LABEL = "alarm_label"; + final static String ALARM_ALERT_ACTION = "com.android.alarmclock.ALARM_ALERT"; + final static String ID = "alarm_id"; + final static String TIME = "alarm_time"; + final static String LABEL = "alarm_label"; final static String PREF_SNOOZE_ID = "snooze_id"; final static String PREF_SNOOZE_TIME = "snooze_time"; final static String PREF_SNOOZE_LABEL = "snooze_label"; private final static String DM12 = "E h:mm aa"; - private final static String DM24 = "E k:mm"; + private final static String DM24 = "E kk:mm"; private final static String M12 = "h:mm aa"; - private final static String M24 = "k:mm"; + // Shared with DigitalClock + final static String M24 = "kk:mm"; /** * Mapping from days in this application (where Monday is 0) to diff --git a/src/com/android/alarmclock/DigitalClock.java b/src/com/android/alarmclock/DigitalClock.java index d131066..7ae92f1 100644 --- a/src/com/android/alarmclock/DigitalClock.java +++ b/src/com/android/alarmclock/DigitalClock.java @@ -40,7 +40,6 @@ import java.util.Calendar; public class DigitalClock extends LinearLayout { private final static String M12 = "h:mm"; - private final static String M24 = "k:mm"; private Calendar mCalendar; private String mFormat; @@ -188,7 +187,7 @@ public class DigitalClock extends LinearLayout { } private void setDateFormat() { - mFormat = Alarms.get24HourMode(mContext) ? M24 : M12; + mFormat = Alarms.get24HourMode(mContext) ? Alarms.M24 : M12; mAmPm.setShowAmPm(mFormat == M12); } -- 2.11.0