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

Commit ec586994 authored by Svetoslav's avatar Svetoslav Committed by Android (Google) Code Review
Browse files

Merge "CalendarView header not updated on year change." into jb-mr2-dev

parents 054255c6 a0851795

core/java/android/widget/CalendarView.java

+8 −11
Original line number Diff line number Diff line
@@ -1248,9 +1248,7 @@ public class CalendarView extends FrameLayout { 
     * @param calendar A day in the new focus month.

     */

    private void setMonthDisplayed(Calendar calendar) {

        final int newMonthDisplayed = calendar.get(Calendar.MONTH);

        if (mCurrentMonthDisplayed != newMonthDisplayed) {

            mCurrentMonthDisplayed = newMonthDisplayed;

        mCurrentMonthDisplayed = calendar.get(Calendar.MONTH);

        mAdapter.setFocusMonth(mCurrentMonthDisplayed);

        final int flags = DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_NO_MONTH_DAY

                | DateUtils.FORMAT_SHOW_YEAR;
@@ -1259,7 +1257,6 @@ public class CalendarView extends FrameLayout { 
        mMonthName.setText(newMonthName);

        mMonthName.invalidate();

    }

    }



    /**

     * @return Returns the number of weeks between the current <code>date</code>