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

Commit f1189e9a authored by Svetoslav Ganov's avatar Svetoslav Ganov
Browse files

CalendarView diregarding XML attributes. 

1. CalendarView was disregarding XMl attributes.

2. CalendarView was trying to set the current date
   to today without checking where today is between
   min and max date.

bug:5116456

Change-Id: Ie5a81826a3cd028f42e18a7985461fa283839171
parent ea515aea

core/java/android/widget/CalendarView.java

+14 −6
Original line number Diff line number Diff line
@@ -339,10 +339,8 @@ public class CalendarView extends FrameLayout { 
        // initialization based on locale

        setCurrentLocale(Locale.getDefault());



        TypedValue calendarViewStyle = new TypedValue();

        context.getTheme().resolveAttribute(R.attr.calendarViewStyle, calendarViewStyle, true);

        TypedArray attributesArray = context.obtainStyledAttributes(calendarViewStyle.resourceId,

                R.styleable.CalendarView);

        TypedArray attributesArray = context.obtainStyledAttributes(attrs, R.styleable.CalendarView,

                R.attr.calendarViewStyle, 0);

        mShowWeekNumber = attributesArray.getBoolean(R.styleable.CalendarView_showWeekNumber,

                DEFAULT_SHOW_WEEK_NUMBER);

        mFirstDayOfWeek = attributesArray.getInt(R.styleable.CalendarView_firstDayOfWeek,
@@ -355,6 +353,9 @@ public class CalendarView extends FrameLayout { 
        if (TextUtils.isEmpty(maxDate) || !parseDate(maxDate, mMaxDate)) {

            parseDate(DEFAULT_MAX_DATE, mMaxDate);

        }

        if (mMaxDate.before(mMinDate)) {

            throw new IllegalArgumentException("Max date cannot be before min date.");

        }

        mShownWeekCount = attributesArray.getInt(R.styleable.CalendarView_shownWeekCount,

                DEFAULT_SHOWN_WEEK_COUNT);

        mSelectedWeekBackgroundColor = attributesArray.getColor(
@@ -407,9 +408,16 @@ public class CalendarView extends FrameLayout { 
        setUpListView();

        setUpAdapter();



        // go to today now

        // go to today or whichever is close to today min or max date

        mTempDate.setTimeInMillis(System.currentTimeMillis());

        if (mTempDate.before(mMinDate)) {

            goTo(mMinDate, false, true, true);

        } else if (mMaxDate.before(mTempDate)) {

            goTo(mMaxDate, false, true, true);

        } else {

            goTo(mTempDate, false, true, true);

        }



        invalidate();

    }