diff options
| author | Raj Yengisetty <rajesh@cyngn.com> | 2015-04-14 17:52:24 -0700 |
|---|---|---|
| committer | Matt Garnes <matt@cyngn.com> | 2015-04-15 23:21:03 +0000 |
| commit | ebccbe95a0a490cbd37138dc44665bd304251cd4 (patch) | |
| tree | 9645bf65ee623f365ba5e0b5184be82902b7348f | |
| parent | 329d8a62f5b91861aeba7fa855da0e33c4b65867 (diff) | |
| download | android_packages_apps_Calendar-ebccbe95a0a490cbd37138dc44665bd304251cd4.tar.gz android_packages_apps_Calendar-ebccbe95a0a490cbd37138dc44665bd304251cd4.tar.bz2 android_packages_apps_Calendar-ebccbe95a0a490cbd37138dc44665bd304251cd4.zip | |
Calendar: do not auto save events when importing
Change-Id: Ia359592ef99becab0fda94a938e5cafd639eaebb
(cherry picked from commit d276a6b69d1d1751176ed84a40d9b13ba63b476b)
| -rw-r--r-- | src/com/android/calendar/ImportActivity.java | 3 | ||||
| -rw-r--r-- | src/com/android/calendar/event/EditEventActivity.java | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/calendar/ImportActivity.java b/src/com/android/calendar/ImportActivity.java index 0a4a89a1..9a499d8e 100644 --- a/src/com/android/calendar/ImportActivity.java +++ b/src/com/android/calendar/ImportActivity.java @@ -13,6 +13,7 @@ import android.os.Bundle; import android.provider.CalendarContract; import android.text.TextUtils; import android.widget.Toast; +import com.android.calendar.event.EditEventActivity; import com.android.calendar.icalendar.Attendee; import com.android.calendar.icalendar.IcalendarUtils; import com.android.calendar.icalendar.VCalendar; @@ -106,6 +107,8 @@ public class ImportActivity extends Activity { getLocalTimeFromString(dtEnd)); } + calIntent.putExtra(EditEventActivity.EXTRA_READ_ONLY, true); + try { startActivity(calIntent); } catch (ActivityNotFoundException e) { diff --git a/src/com/android/calendar/event/EditEventActivity.java b/src/com/android/calendar/event/EditEventActivity.java index 173a5735..56939bdd 100644 --- a/src/com/android/calendar/event/EditEventActivity.java +++ b/src/com/android/calendar/event/EditEventActivity.java @@ -50,6 +50,8 @@ public class EditEventActivity extends AbstractCalendarActivity { public static final String EXTRA_EVENT_REMINDERS = "reminders"; + public static final String EXTRA_READ_ONLY = "read_only"; + private static boolean mIsMultipane; private EditEventFragment mEditFragment; @@ -93,12 +95,14 @@ public class EditEventActivity extends AbstractCalendarActivity { if (mEditFragment == null) { Intent intent = null; + boolean readOnly = false; if (mEventInfo.id == -1) { intent = getIntent(); + readOnly = intent.getBooleanExtra(EXTRA_READ_ONLY, false); } mEditFragment = new EditEventFragment(mEventInfo, mReminders, mEventColorInitialized, - mEventColor, false, intent); + mEventColor, readOnly, intent); mEditFragment.mShowModifyDialogOnLaunch = getIntent().getBooleanExtra( CalendarController.EVENT_EDIT_ON_LAUNCH, false); |