diff options
| author | Raj Yengisetty <rajesh@cyngn.com> | 2015-04-14 17:52:24 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-18 13:52:54 -0700 |
| commit | e4a5b8a7f62775e0796d66635548480622ead90f (patch) | |
| tree | 25eb19a3c56cf75e4d92cba3aff5d0f80e818546 /src | |
| parent | 694be6c84ea620bec5bfa493f5ac277377ef994e (diff) | |
| download | android_packages_apps_Calendar-e4a5b8a7f62775e0796d66635548480622ead90f.tar.gz android_packages_apps_Calendar-e4a5b8a7f62775e0796d66635548480622ead90f.tar.bz2 android_packages_apps_Calendar-e4a5b8a7f62775e0796d66635548480622ead90f.zip | |
Calendar: do not auto save events when importing
Change-Id: Ia359592ef99becab0fda94a938e5cafd639eaebb
(cherry picked from commit d276a6b69d1d1751176ed84a40d9b13ba63b476b)
Diffstat (limited to 'src')
| -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); |