commit c5f92d7bdeb1950ace783cc022aa41a4b4f00cd6
author Erik <epastern@google.com> Thu Nov 11 16:18:34 2010 -0800
committer Erik <epastern@google.com> Thu Nov 11 16:43:37 2010 -0800
tree f82424c0e1838d729e4e8e88edfb320f9fab007f
parent 36a4668f603c432d08ad156cd7c731f9838c0212

b/3188954 & b/3188992 Fixes uses of home tz

Change-Id: Ife639ea40b327c50648b693dce4d5fdb9c70186a

src/com/android/calendar/AllInOneActivity.java

diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java
index b513316..095e97e 100644
--- a/src/com/android/calendar/AllInOneActivity.java
+++ b/src/com/android/calendar/AllInOneActivity.java
@@ -75,6 +75,7 @@
     private boolean mPaused = true;
     private boolean mUpdateOnResume = false;
     private TextView mHomeTime;
+    private String mTimeZone;
 
     // Action bar and Navigation bar (left side of Action bar)
     private ActionBar mActionBar;
@@ -124,7 +125,8 @@
         } else {
             viewType = Utils.getViewTypeFromIntentAndSharedPref(this);
         }
-        Time t = new Time();
+        mTimeZone = Utils.getTimeZone(this, mHomeTimeUpdater);
+        Time t = new Time(mTimeZone);
         t.set(timeMillis);
 
         if (icicle != null && getIntent() != null) {
@@ -299,7 +301,7 @@
 
         ft.commit(); // this needs to be after setMainPane()
 
-        Time t = new Time();
+        Time t = new Time(mTimeZone);
         t.set(timeMillis);
         if (viewType != ViewType.EDIT) {
             mController.sendEvent(this, EventType.GO_TO, t, null, -1, viewType);
@@ -340,7 +342,7 @@
                 return true;
             case R.id.action_today:
                 viewType = ViewType.CURRENT;
-                t = new Time();
+                t = new Time(mTimeZone);
                 t.setToNow();
                 break;
             case R.id.action_create_event:
@@ -453,10 +455,10 @@
     }
 
     private void updateHomeClock() {
-        String tz = Utils.getTimeZone(this, mHomeTimeUpdater);
+        mTimeZone = Utils.getTimeZone(this, mHomeTimeUpdater);
         if (mIsMultipane && (mCurrentView == ViewType.DAY || mCurrentView == ViewType.WEEK)
-                && !TextUtils.equals(tz, Time.getCurrentTimezone())) {
-            Time time = new Time(tz);
+                && !TextUtils.equals(mTimeZone, Time.getCurrentTimezone())) {
+            Time time = new Time(mTimeZone);
             time.setToNow();
             long millis = time.toMillis(true);
             boolean isDST = time.isDst != 0;
@@ -465,11 +467,10 @@
                 flags |= DateUtils.FORMAT_24HOUR;
             }
             // Formats the time as
-            String timeString =
-                    (new StringBuilder(Utils.formatDateRange(this, millis, millis, flags)))
-                    .append(" ").append(TimeZone.getTimeZone(tz).getDisplayName(
-                            isDST, TimeZone.SHORT, Locale.getDefault()))
-                    .toString();
+            String timeString = (new StringBuilder(
+                    Utils.formatDateRange(this, millis, millis, flags))).append(" ").append(
+                    TimeZone.getTimeZone(mTimeZone).getDisplayName(
+                            isDST, TimeZone.SHORT, Locale.getDefault())).toString();
             mHomeTime.setText(timeString);
             mHomeTime.setVisibility(View.VISIBLE);
             // Update when the minute changes