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

Commit 77412fb0 authored by Sam Blitzstein's avatar Sam Blitzstein Committed by Android (Google) Code Review
Browse files

Merge "Allow reformatted timezone display name to show." into ics-ub-calendar-cream

parents e3bcdfe5 dd67b8db

src/com/android/calendar/GeneralPreferences.java

+3 −3
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ public class GeneralPreferences extends PreferenceFragment implements 
        if (mTzPickerUtils == null) {

            mTzPickerUtils = new TimeZonePickerUtils(getActivity());

        }

        String timezoneName = mTzPickerUtils.getGmtDisplayName(getActivity(), mTimeZoneId,

        CharSequence timezoneName = mTzPickerUtils.getGmtDisplayName(getActivity(), mTimeZoneId,

                System.currentTimeMillis());

        mHomeTZ.setSummary(timezoneName != null ? timezoneName : mTimeZoneId);
@@ -424,8 +424,8 @@ public class GeneralPreferences extends PreferenceFragment implements 
            mTzPickerUtils = new TimeZonePickerUtils(getActivity());

        }



        final String timezoneName = mTzPickerUtils.getGmtDisplayName(getActivity(), tzi.mTzId,

                System.currentTimeMillis());

        final CharSequence timezoneName = mTzPickerUtils.getGmtDisplayName(

                getActivity(), tzi.mTzId, System.currentTimeMillis());

        mHomeTZ.setSummary(timezoneName);

        Utils.setTimeZone(getActivity(), tzi.mTzId);

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -431,7 +431,8 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa 
        if (mTzPickerUtils == null) {

            mTzPickerUtils = new TimeZonePickerUtils(mActivity);

        }

        String displayName = mTzPickerUtils.getGmtDisplayName(mActivity, mTimezone, eventStartTime);

        CharSequence displayName =

                mTzPickerUtils.getGmtDisplayName(mActivity, mTimezone, eventStartTime);



        mTimezoneTextView.setText(displayName);

        mTimezoneButton.setText(displayName);