packages/apps/Calendar
Revision | af45d5b3aad58c55131415b794df1c81c68fc357 (tree) |
---|---|
Time | 2010-04-24 08:05:31 |
Author | Erik <roboerik@andr...> |
Commiter | Android (Google) Code Review |
Merge "b/2622128 Fix crash from editEvent and EventInfoActivity" into froyo
@@ -124,6 +124,9 @@ public class DeleteEventHelper { | ||
124 | 124 | new DialogInterface.OnClickListener() { |
125 | 125 | public void onClick(DialogInterface dialog, int button) { |
126 | 126 | deleteExceptionEvent(); |
127 | + if (mExitWhenDone) { | |
128 | + mParent.finish(); | |
129 | + } | |
127 | 130 | } |
128 | 131 | }; |
129 | 132 |
@@ -131,6 +131,7 @@ public class EditEvent extends Activity implements View.OnClickListener, | ||
131 | 131 | Events.VISIBILITY, // 13 |
132 | 132 | Events.OWNER_ACCOUNT, // 14 |
133 | 133 | Events.HAS_ATTENDEE_DATA, // 15 |
134 | + Events.ORIGINAL_EVENT, // 16 used for deleting exception events | |
134 | 135 | }; |
135 | 136 | private static final int EVENT_INDEX_ID = 0; |
136 | 137 | private static final int EVENT_INDEX_TITLE = 1; |
@@ -116,6 +116,7 @@ public class EventInfoActivity extends Activity implements View.OnClickListener, | ||
116 | 116 | // TODO Events.GUESTS_CAN_INVITE_OTHERS has not been implemented in calendar provider |
117 | 117 | Events.GUESTS_CAN_INVITE_OTHERS, // 15 |
118 | 118 | Events.ORGANIZER, // 16 |
119 | + Events.ORIGINAL_EVENT // 17 do not remove; used in DeleteEventHelper | |
119 | 120 | }; |
120 | 121 | private static final int EVENT_INDEX_ID = 0; |
121 | 122 | private static final int EVENT_INDEX_TITLE = 1; |