Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 386c3699 authored by Sam Blitzstein's avatar Sam Blitzstein
Browse files

Reformat timezone name to better distinguish GMT from timezone. DO NOT MERGE 

Merge of https://googleplex-android-review.googlesource.com/#/c/305860/
into Cream.

Bug: 8794160
Change-Id: I90c95cc14fc37ef95432fb7c5b099acc825e191b
parent b3f4b48e

src/com/android/calendar/GeneralPreferences.java

+2 −2
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ public class GeneralPreferences extends PreferenceFragment implements 
            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 @@ public class GeneralPreferences extends PreferenceFragment implements 
        }



        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

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa 
            mTzPickerUtils = new TimeZonePickerUtils(mActivity);

        }

        CharSequence displayName =

                mTzPickerUtils.getGmtDisplayName(mActivity, mTimezone, eventStartTime);

                mTzPickerUtils.getGmtDisplayName(mActivity, mTimezone, eventStartTime, true);



        mTimezoneTextView.setText(displayName);

        mTimezoneButton.setText(displayName);