commit 6826fd424af1495da8680bb887107361091a9d3c
author Baligh Uddin <baligh@google.com> Sun May 05 01:25:53 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun May 05 01:25:53 2013 +0000
tree d9e25f0eaee2e6b0468ccf58a01fe4c1a45378a8
parent a1f9b6d4c49a9f6d9f785af0b66d928cca5b3e78
parent f7be6fa5bd3baf57973a31f981af95c9f50543c6

Merge "Revert "Revert "Import translations. DO NOT MERGE""" into ics-ub-calendar-denim

res/layout/recurrencepicker.xml

diff --git a/res/layout/recurrencepicker.xml b/res/layout/recurrencepicker.xml
index ee022eb..cfe4b6a 100644
--- a/res/layout/recurrencepicker.xml
+++ b/res/layout/recurrencepicker.xml
@@ -179,8 +179,7 @@
                             android:id="@+id/repeatMonthlyByNthDayOfTheWeek"
                             style="@style/TextAppearance.RecurrencePickerStyle"
                             android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/recurrence_month_pattern_by_day_of_week" />
+                            android:layout_height="wrap_content" />
                     </RadioGroup>
 
                     <LinearLayout
@@ -271,4 +270,4 @@
                 android:textColor="@color/done_text_color" />
         </LinearLayout>
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>

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);