Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41bae6dd authored by Sam Blitzstein's avatar Sam Blitzstein
Browse files

Fixed back-key bug in day/week view. DO NOT MERGE 

Fixed buy causing incorrect back-key result in day/week view.
Bug occurred only after having modified date using date-picker.

Bug: 7064660
Change-Id: Ie8b75358f5ca5541cdc8b8052bc2514c5f4392d1
parent 013fda07

src/com/android/calendar/month/MonthByWeekAdapter.java

+3 −4
Original line number Diff line number Diff line
@@ -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,

                    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)) {