diff options
author | Isaac Katzenelson <isaack@android.com> | 2012-05-02 18:25:36 -0700 |
---|---|---|
committer | Isaac Katzenelson <isaack@android.com> | 2012-05-08 17:06:51 -0700 |
commit | 6bcafcf4f28c2d1053547694bd60b3dd9c7fbaa1 (patch) | |
tree | 6823e261589e991b73dc58d3cf6749dd7f51cb42 /src/com/android/calendar/EventInfoActivity.java | |
parent | 24be47283bedef62937d1bba1f7572834c33a448 (diff) | |
download | android_packages_apps_Calendar-6bcafcf4f28c2d1053547694bd60b3dd9c7fbaa1.tar.gz android_packages_apps_Calendar-6bcafcf4f28c2d1053547694bd60b3dd9c7fbaa1.tar.bz2 android_packages_apps_Calendar-6bcafcf4f28c2d1053547694bd60b3dd9c7fbaa1.zip |
Fix agenda view goto behavior
Bug: 6285812 Tapping on an all day events on Tablet Agenda view makes the view to change like crazy
Change-Id: I643106a23acff88b16da3b8f45ce8c908b70506c
Diffstat (limited to 'src/com/android/calendar/EventInfoActivity.java')
-rw-r--r-- | src/com/android/calendar/EventInfoActivity.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/calendar/EventInfoActivity.java b/src/com/android/calendar/EventInfoActivity.java index 0ea6b369..4a69b63d 100644 --- a/src/com/android/calendar/EventInfoActivity.java +++ b/src/com/android/calendar/EventInfoActivity.java @@ -17,7 +17,6 @@ package com.android.calendar; import static android.provider.CalendarContract.EXTRA_EVENT_BEGIN_TIME; import static android.provider.CalendarContract.EXTRA_EVENT_END_TIME; -import static com.android.calendar.CalendarController.ATTENDEE_NO_RESPONSE; import static com.android.calendar.CalendarController.EVENT_ATTENDEE_RESPONSE; import android.app.ActionBar; @@ -29,6 +28,7 @@ import android.content.Intent; import android.content.res.Resources; import android.net.Uri; import android.os.Bundle; +import android.provider.CalendarContract.Attendees; import android.provider.CalendarContract.Events; import android.util.Log; @@ -60,7 +60,8 @@ public class EventInfoActivity extends Activity { } else if (intent != null && Intent.ACTION_VIEW.equals(intent.getAction())) { mStartMillis = intent.getLongExtra(EXTRA_EVENT_BEGIN_TIME, 0); mEndMillis = intent.getLongExtra(EXTRA_EVENT_END_TIME, 0); - attendeeResponse = intent.getIntExtra(EVENT_ATTENDEE_RESPONSE, ATTENDEE_NO_RESPONSE); + attendeeResponse = intent.getIntExtra(EVENT_ATTENDEE_RESPONSE, + Attendees.ATTENDEE_STATUS_NONE); Uri data = intent.getData(); if (data != null) { try { @@ -77,7 +78,7 @@ public class EventInfoActivity extends Activity { if (!res.getBoolean(R.bool.agenda_show_event_info_full_screen) && !res.getBoolean(R.bool.show_event_info_full_screen)) { CalendarController.getInstance(this) - .launchViewEvent(mEventId, mStartMillis, mEndMillis); + .launchViewEvent(mEventId, mStartMillis, mEndMillis, attendeeResponse); finish(); return; } |