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

Unverified Commit 489b5dd1 authored by Jonas Häusler's avatar Jonas Häusler Committed by Michael Bestas
Browse files

respect timezone delivered via intent 

Change-Id: Ied29aedc013a60e1be1dc34637d84923335e5c02
parent 77b96bf2

app/src/main/java/com/android/calendar/CalendarEventModel.java

+5 −0
Original line number Diff line number Diff line
@@ -182,6 +182,11 @@ public class CalendarEventModel implements Serializable { 
            mRrule = rrule;

        }



        String timezone = intent.getStringExtra(Events.EVENT_TIMEZONE);

        if (timezone != null) {

            mTimezone = timezone;

        }



        String emails = intent.getStringExtra(Intent.EXTRA_EMAIL);

        if (!TextUtils.isEmpty(emails)) {

            String[] emailArray = emails.split("[ ,;]");

app/src/main/java/com/android/calendar/event/EditEventFragment.java

+1 −4
Original line number Diff line number Diff line
@@ -225,10 +225,7 @@ public class EditEventFragment extends Fragment implements EventHandler, OnColor 
                mUri = ContentUris.withAppendedId(Events.CONTENT_URI, mEvent.id);

            } else {

                // New event. All day?

                if (mEvent.extraLong == CalendarController.EXTRA_CREATE_ALL_DAY) {

                    mModel.mAllDay = true;

                    mModel.mTimezone = Time.TIMEZONE_UTC; // timezone is UTC for all-day events

                }

                mModel.mAllDay = mEvent.extraLong == CalendarController.EXTRA_CREATE_ALL_DAY;

            }

            if (mEvent.startTime != null) {

                mBegin = mEvent.startTime.toMillis();