commit 6aea44c850a041c495f0b572e0b5c55be6499136
author Baligh Uddin <baligh@google.com> Sun May 05 00:02:23 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun May 05 00:02:24 2013 +0000
tree adefa94ed6905e297ac0eb0669bd98692e769fa1
parent bb2543169ef9d6c7708763ab4aa2543a682a9bf2
parent 45b7e9cb39a7901f8768843cc39855d27daa1a3e

Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

src/com/android/calendar/GeneralPreferences.java

diff --git a/src/com/android/calendar/GeneralPreferences.java b/src/com/android/calendar/GeneralPreferences.java
index ccd4b33..54fc0e7 100644
--- a/src/com/android/calendar/GeneralPreferences.java
+++ b/src/com/android/calendar/GeneralPreferences.java
@@ -210,7 +210,7 @@
             mTzPickerUtils = new TimeZonePickerUtils(getActivity());
         }
         CharSequence timezoneName = mTzPickerUtils.getGmtDisplayName(getActivity(), mTimeZoneId,
-                System.currentTimeMillis());
+                System.currentTimeMillis(), false);
         mHomeTZ.setSummary(timezoneName != null ? timezoneName : mTimeZoneId);
 
         TimeZonePickerDialog tzpd = (TimeZonePickerDialog) activity.getFragmentManager()
@@ -425,7 +425,7 @@
         }
 
         final CharSequence timezoneName = mTzPickerUtils.getGmtDisplayName(
-                getActivity(), tzi.mTzId, System.currentTimeMillis());
+                getActivity(), tzi.mTzId, System.currentTimeMillis(), false);
         mHomeTZ.setSummary(timezoneName);
         Utils.setTimeZone(getActivity(), tzi.mTzId);
     }

src/com/android/calendar/event/EditEventView.java

diff --git a/src/com/android/calendar/event/EditEventView.java b/src/com/android/calendar/event/EditEventView.java
index 09daa0c..3df601c 100644
--- a/src/com/android/calendar/event/EditEventView.java
+++ b/src/com/android/calendar/event/EditEventView.java
@@ -432,7 +432,7 @@
             mTzPickerUtils = new TimeZonePickerUtils(mActivity);
         }
         CharSequence displayName =
-                mTzPickerUtils.getGmtDisplayName(mActivity, mTimezone, eventStartTime);
+                mTzPickerUtils.getGmtDisplayName(mActivity, mTimezone, eventStartTime, true);
 
         mTimezoneTextView.setText(displayName);
         mTimezoneButton.setText(displayName);