Android-x86
Fork
Spenden

  • R/O
  • HTTP
  • SSH
  • HTTPS

packages-apps-Calendar: Commit

packages/apps/Calendar


Commit MetaInfo

Revisionaf45d5b3aad58c55131415b794df1c81c68fc357 (tree)
Zeit2010-04-24 08:05:31
AutorErik <roboerik@andr...>
CommiterAndroid (Google) Code Review

Log Message

Merge "b/2622128 Fix crash from editEvent and EventInfoActivity" into froyo

Ändern Zusammenfassung

Diff

--- a/src/com/android/calendar/DeleteEventHelper.java
+++ b/src/com/android/calendar/DeleteEventHelper.java
@@ -124,6 +124,9 @@ public class DeleteEventHelper {
124124 new DialogInterface.OnClickListener() {
125125 public void onClick(DialogInterface dialog, int button) {
126126 deleteExceptionEvent();
127+ if (mExitWhenDone) {
128+ mParent.finish();
129+ }
127130 }
128131 };
129132
--- a/src/com/android/calendar/EditEvent.java
+++ b/src/com/android/calendar/EditEvent.java
@@ -131,6 +131,7 @@ public class EditEvent extends Activity implements View.OnClickListener,
131131 Events.VISIBILITY, // 13
132132 Events.OWNER_ACCOUNT, // 14
133133 Events.HAS_ATTENDEE_DATA, // 15
134+ Events.ORIGINAL_EVENT, // 16 used for deleting exception events
134135 };
135136 private static final int EVENT_INDEX_ID = 0;
136137 private static final int EVENT_INDEX_TITLE = 1;
--- a/src/com/android/calendar/EventInfoActivity.java
+++ b/src/com/android/calendar/EventInfoActivity.java
@@ -116,6 +116,7 @@ public class EventInfoActivity extends Activity implements View.OnClickListener,
116116 // TODO Events.GUESTS_CAN_INVITE_OTHERS has not been implemented in calendar provider
117117 Events.GUESTS_CAN_INVITE_OTHERS, // 15
118118 Events.ORGANIZER, // 16
119+ Events.ORIGINAL_EVENT // 17 do not remove; used in DeleteEventHelper
119120 };
120121 private static final int EVENT_INDEX_ID = 0;
121122 private static final int EVENT_INDEX_TITLE = 1;
Show on old repository browser