diff options
| author | Erik <roboerik@android.com> | 2010-04-26 11:22:28 -0700 |
|---|---|---|
| committer | Erik <roboerik@android.com> | 2010-04-26 11:22:28 -0700 |
| commit | e574d426fabf57e471346ec787160cd1d7f96213 (patch) | |
| tree | a048ce66a1a042570955cb199052cb64fb726f5f | |
| parent | af45d5b3aad58c55131415b794df1c81c68fc357 (diff) | |
| download | Calendar-e574d426fabf57e471346ec787160cd1d7f96213.tar.gz | |
Revert "b/2622128 Fix crash from editEvent and EventInfoActivity"
This reverts commit b6a9b7130b754ef2c965a4ddb6134bc82e8a605c. Moving this to
master instead of froyo.
| -rw-r--r-- | src/com/android/calendar/DeleteEventHelper.java | 3 | ||||
| -rw-r--r-- | src/com/android/calendar/EditEvent.java | 1 | ||||
| -rw-r--r-- | src/com/android/calendar/EventInfoActivity.java | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/src/com/android/calendar/DeleteEventHelper.java b/src/com/android/calendar/DeleteEventHelper.java index 44c13128..ca80c904 100644 --- a/src/com/android/calendar/DeleteEventHelper.java +++ b/src/com/android/calendar/DeleteEventHelper.java @@ -124,9 +124,6 @@ public class DeleteEventHelper { new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int button) { deleteExceptionEvent(); - if (mExitWhenDone) { - mParent.finish(); - } } }; diff --git a/src/com/android/calendar/EditEvent.java b/src/com/android/calendar/EditEvent.java index 3966e239..1f646b5e 100644 --- a/src/com/android/calendar/EditEvent.java +++ b/src/com/android/calendar/EditEvent.java @@ -131,7 +131,6 @@ public class EditEvent extends Activity implements View.OnClickListener, Events.VISIBILITY, // 13 Events.OWNER_ACCOUNT, // 14 Events.HAS_ATTENDEE_DATA, // 15 - Events.ORIGINAL_EVENT, // 16 used for deleting exception events }; private static final int EVENT_INDEX_ID = 0; private static final int EVENT_INDEX_TITLE = 1; diff --git a/src/com/android/calendar/EventInfoActivity.java b/src/com/android/calendar/EventInfoActivity.java index 23cd9e90..8f4b4ccb 100644 --- a/src/com/android/calendar/EventInfoActivity.java +++ b/src/com/android/calendar/EventInfoActivity.java @@ -116,7 +116,6 @@ public class EventInfoActivity extends Activity implements View.OnClickListener, // TODO Events.GUESTS_CAN_INVITE_OTHERS has not been implemented in calendar provider Events.GUESTS_CAN_INVITE_OTHERS, // 15 Events.ORGANIZER, // 16 - Events.ORIGINAL_EVENT // 17 do not remove; used in DeleteEventHelper }; private static final int EVENT_INDEX_ID = 0; private static final int EVENT_INDEX_TITLE = 1; |