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

Commit 22c1c2cd authored by Alan Viverette's avatar Alan Viverette
Browse files

Ensure WeeksAdapter calls notifyDataSetChanged when needed 

Also cleans up references to Context.

BUG: 10241917
Change-Id: Ic0b3d650cd85d656002cbb11b2bc73180ffe1bec
parent 7354b834

core/java/android/widget/CalendarView.java

+7 −10
Original line number Original line Diff line number Diff line
@@ -391,7 +391,7 @@ public class CalendarView extends FrameLayout { 
        mWeekSeperatorLineWidth = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,

        mWeekSeperatorLineWidth = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,

                UNSCALED_WEEK_SEPARATOR_LINE_WIDTH, displayMetrics);

                UNSCALED_WEEK_SEPARATOR_LINE_WIDTH, displayMetrics);





        LayoutInflater layoutInflater = (LayoutInflater) mContext

        LayoutInflater layoutInflater = (LayoutInflater) context

                .getSystemService(Service.LAYOUT_INFLATER_SERVICE);

                .getSystemService(Service.LAYOUT_INFLATER_SERVICE);

        View content = layoutInflater.inflate(R.layout.calendar_view, null, false);

        View content = layoutInflater.inflate(R.layout.calendar_view, null, false);

        addView(content);

        addView(content);
@@ -874,7 +874,6 @@ public class CalendarView extends FrameLayout { 
        }

        }

        mFirstDayOfWeek = firstDayOfWeek;

        mFirstDayOfWeek = firstDayOfWeek;

        mAdapter.init();

        mAdapter.init();

        mAdapter.notifyDataSetChanged();

        setUpHeader();

        setUpHeader();

    }

    }
@@ -937,7 +936,7 @@ public class CalendarView extends FrameLayout { 
    }

    }





    private void updateDateTextSize() {

    private void updateDateTextSize() {

        TypedArray dateTextAppearance = getContext().obtainStyledAttributes(

        TypedArray dateTextAppearance = mContext.obtainStyledAttributes(

                mDateTextAppearanceResId, R.styleable.TextAppearance);

                mDateTextAppearanceResId, R.styleable.TextAppearance);

        mDateTextSize = dateTextAppearance.getDimensionPixelSize(

        mDateTextSize = dateTextAppearance.getDimensionPixelSize(

                R.styleable.TextAppearance_textSize, DEFAULT_DATE_TEXT_SIZE);

                R.styleable.TextAppearance_textSize, DEFAULT_DATE_TEXT_SIZE);
@@ -1004,7 +1003,7 @@ public class CalendarView extends FrameLayout { 
     */

     */

    private void setUpAdapter() {

    private void setUpAdapter() {

        if (mAdapter == null) {

        if (mAdapter == null) {

            mAdapter = new WeeksAdapter(getContext());

            mAdapter = new WeeksAdapter();

            mAdapter.registerDataSetObserver(new DataSetObserver() {

            mAdapter.registerDataSetObserver(new DataSetObserver() {

                @Override

                @Override

                public void onChanged() {

                public void onChanged() {
@@ -1333,19 +1332,16 @@ public class CalendarView extends FrameLayout { 
     * </p>

     * </p>

     */

     */

    private class WeeksAdapter extends BaseAdapter implements OnTouchListener {

    private class WeeksAdapter extends BaseAdapter implements OnTouchListener {

        private final Calendar mSelectedDate = Calendar.getInstance();

        private final GestureDetector mGestureDetector;





        private int mSelectedWeek;

        private int mSelectedWeek;





        private GestureDetector mGestureDetector;



        private int mFocusedMonth;

        private int mFocusedMonth;





        private final Calendar mSelectedDate = Calendar.getInstance();



        private int mTotalWeekCount;

        private int mTotalWeekCount;





        public WeeksAdapter(Context context) {

        public WeeksAdapter() {

            mContext = context;

            mGestureDetector = new GestureDetector(mContext, new CalendarGestureListener());

            mGestureDetector = new GestureDetector(mContext, new CalendarGestureListener());

            init();

            init();

        }

        }
@@ -1360,6 +1356,7 @@ public class CalendarView extends FrameLayout { 
                || mMaxDate.get(Calendar.DAY_OF_WEEK) != mFirstDayOfWeek) {

                || mMaxDate.get(Calendar.DAY_OF_WEEK) != mFirstDayOfWeek) {

                mTotalWeekCount++;

                mTotalWeekCount++;

            }

            }

            notifyDataSetChanged();

        }

        }





        /**

        /**