Will now update time format on resume

We weren't refreshing the time strings when the format changed to/from
24 hour mode. Now it will update in onResume to make sure we catch any
changes.

Change-Id: I829779fe09062cd65449810c94f90bbda42f84a2

diff --git a/src/com/android/calendar/CalendarActivity.java b/src/com/android/calendar/CalendarActivity.java
index 02bfdbf..982268d 100644 (file)
--- a/src/com/android/calendar/CalendarActivity.java
+++ b/src/com/android/calendar/CalendarActivity.java
@@ -140,8 +140,12 @@ public class CalendarActivity extends Activity implements Navigator {
         mEventLoader.startBackgroundThread();
         eventsChanged();
         CalendarView view = (CalendarView) mViewSwitcher.getCurrentView();
+        view.updateIs24HourFormat();
         view.restartCurrentTimeUpdates();
 
+        view = (CalendarView) mViewSwitcher.getNextView();
+        view.updateIs24HourFormat();
+
         // Register for Intent broadcasts
         IntentFilter filter = new IntentFilter();
 

diff --git a/src/com/android/calendar/CalendarView.java b/src/com/android/calendar/CalendarView.java
index 4618454..da17af6 100644 (file)
--- a/src/com/android/calendar/CalendarView.java
+++ b/src/com/android/calendar/CalendarView.java
@@ -475,9 +475,7 @@ public class CalendarView extends View
 
         p.setTextSize(HOURS_FONT_SIZE);
         p.setTypeface(null);
-        mIs24HourFormat = DateFormat.is24HourFormat(context);
-        mHourStrs = mIs24HourFormat ? CalendarData.s24Hours : CalendarData.s12HoursNoAmPm;
-        mHoursWidth = computeMaxStringWidth(0, mHourStrs, p);
+        updateIs24HourFormat();
 
         mAmString = DateUtils.getAMPMString(Calendar.AM);
         mPmString = DateUtils.getAMPMString(Calendar.PM);
@@ -526,6 +524,11 @@ public class CalendarView extends View
         }
     }
 
+    public void updateIs24HourFormat() {
+        mIs24HourFormat = DateFormat.is24HourFormat(mParentActivity);
+        mHourStrs = mIs24HourFormat ? CalendarData.s24Hours : CalendarData.s12HoursNoAmPm;
+    }
+
     /**
      * Returns the start of the selected time in milliseconds since the epoch.
      *