Android-x86
Fork
Spenden

  • R/O
  • HTTP
  • SSH
  • HTTPS

packages-apps-Calendar: Commit

packages/apps/Calendar


Commit MetaInfo

Revisione574d426fabf57e471346ec787160cd1d7f96213 (tree)
Zeit2010-04-27 03:22:28
AutorErik <roboerik@andr...>
CommiterErik

Log Message

Revert "b/2622128 Fix crash from editEvent and EventInfoActivity"

This reverts commit b6a9b7130b754ef2c965a4ddb6134bc82e8a605c. Moving this to
master instead of froyo.

Ändern Zusammenfassung

Diff

--- a/src/com/android/calendar/DeleteEventHelper.java
+++ b/src/com/android/calendar/DeleteEventHelper.java
@@ -124,9 +124,6 @@ public class DeleteEventHelper {
124124 new DialogInterface.OnClickListener() {
125125 public void onClick(DialogInterface dialog, int button) {
126126 deleteExceptionEvent();
127- if (mExitWhenDone) {
128- mParent.finish();
129- }
130127 }
131128 };
132129
--- 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,
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
135134 };
136135 private static final int EVENT_INDEX_ID = 0;
137136 private static final int EVENT_INDEX_TITLE = 1;
--- 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,
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
120119 };
121120 private static final int EVENT_INDEX_ID = 0;
122121 private static final int EVENT_INDEX_TITLE = 1;
Show on old repository browser