diff options
| author | Sam Blitzstein <sblitz@google.com> | 2012-09-06 14:57:59 -0700 |
|---|---|---|
| committer | Sam Blitzstein <sblitz@google.com> | 2012-09-06 15:09:53 -0700 |
| commit | d52514a2b3ad91cac622537f31f5c89f5d986d08 (patch) | |
| tree | 10432a9c35d40cbebc3772392f29aeb21258e83a /src | |
| parent | 7a2de3d0ba146217e19d8dba74ff82000b0e676f (diff) | |
| download | android_packages_apps_Calendar-d52514a2b3ad91cac622537f31f5c89f5d986d08.tar.gz android_packages_apps_Calendar-d52514a2b3ad91cac622537f31f5c89f5d986d08.tar.bz2 android_packages_apps_Calendar-d52514a2b3ad91cac622537f31f5c89f5d986d08.zip | |
Fixed bug causing incorrect result from pressing back-key while in day/week view after having modified the date in the date picker.
Bug: 7064660
Change-Id: Ie8b75358f5ca5541cdc8b8052bc2514c5f4392d1
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/calendar/month/MonthByWeekAdapter.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/calendar/month/MonthByWeekAdapter.java b/src/com/android/calendar/month/MonthByWeekAdapter.java index c08147ad..8d30adc8 100644 --- a/src/com/android/calendar/month/MonthByWeekAdapter.java +++ b/src/com/android/calendar/month/MonthByWeekAdapter.java @@ -286,7 +286,7 @@ public class MonthByWeekAdapter extends SimpleWeeksAdapter { day.minute = currTime.minute; day.allDay = false; day.normalize(true); - if (mShowAgendaWithMonth && !mIsMiniMonth) { + if (mShowAgendaWithMonth || mIsMiniMonth) { // If agenda view is visible with month view , refresh the views // with the selected day's info mController.sendEvent(mContext, EventType.GO_TO, day, day, -1, @@ -294,13 +294,12 @@ public class MonthByWeekAdapter extends SimpleWeeksAdapter { } else { // Else , switch to the detailed view mController.sendEvent(mContext, EventType.GO_TO, day, day, -1, - mIsMiniMonth ? ViewType.CURRENT : ViewType.DETAIL, - CalendarController.EXTRA_GOTO_DATE + ViewType.DETAIL, + CalendarController.EXTRA_GOTO_DATE | CalendarController.EXTRA_GOTO_BACK_TO_PREVIOUS, null, null); } } - @Override public boolean onTouch(View v, MotionEvent event) { if (!(v instanceof MonthWeekEventsView)) { |