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

Commit 627dd9b5 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #10515013 CalendarView is always forcing first day of the week... 

Merge "Fix bug #10515013 CalendarView is always forcing first day of the week to Sunday and not taking into account CLDR data" into klp-dev
parents f016a912 b08e5788

core/java/android/widget/CalendarView.java

+12 −9
Original line number Diff line number Diff line
@@ -1028,26 +1028,29 @@ public class CalendarView extends FrameLayout { 
     * Sets up the strings to be used by the header.

     */

    private void setUpHeader() {

        final String[] tinyWeekdayNames = LocaleData.get(Locale.getDefault()).tinyWeekdayNames;

        mDayLabels = new String[mDaysPerWeek];

        for (int i = mFirstDayOfWeek, count = mFirstDayOfWeek + mDaysPerWeek; i < count; i++) {

            int calendarDay = (i > Calendar.SATURDAY) ? i - Calendar.SATURDAY : i;

            mDayLabels[i - mFirstDayOfWeek] = DateUtils.getDayOfWeekString(calendarDay,

                    DateUtils.LENGTH_SHORTEST);

        for (int i = 0; i < mDaysPerWeek; i++) {

            final int j = i + mFirstDayOfWeek;

            final int calendarDay = (j > Calendar.SATURDAY) ? j - Calendar.SATURDAY : j;

            mDayLabels[i] = tinyWeekdayNames[calendarDay];

        }



        // Deal with week number

        TextView label = (TextView) mDayNamesHeader.getChildAt(0);

        if (mShowWeekNumber) {

            label.setVisibility(View.VISIBLE);

        } else {

            label.setVisibility(View.GONE);

        }

        for (int i = 1, count = mDayNamesHeader.getChildCount(); i < count; i++) {

            label = (TextView) mDayNamesHeader.getChildAt(i);

        // Deal with day labels

        final int count = mDayNamesHeader.getChildCount();

        for (int i = 0; i < count - 1; i++) {

            label = (TextView) mDayNamesHeader.getChildAt(i + 1);

            if (mWeekDayTextAppearanceResId > -1) {

                label.setTextAppearance(mContext, mWeekDayTextAppearanceResId);

            }

            if (i < mDaysPerWeek + 1) {

                label.setText(mDayLabels[i - 1]);

            if (i < mDaysPerWeek) {

                label.setText(mDayLabels[i]);

                label.setVisibility(View.VISIBLE);

            } else {

                label.setVisibility(View.GONE);

core/res/res/values/styles.xml

+0 −1
Original line number Diff line number Diff line
@@ -529,7 +529,6 @@ please see styles_device_defaults.xml. 


    <style name="Widget.CalendarView">

        <item name="android:showWeekNumber">true</item>

        <item name="android:firstDayOfWeek">1</item>

        <item name="android:minDate">01/01/1900</item>

        <item name="android:maxDate">12/31/2100</item>

        <item name="android:shownWeekCount">6</item>