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

Commit c03383df authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 56a87f8c: am c255a711: Merge "Ensure WeeksAdapter calls... 

am 56a87f8c: am c255a711: Merge "Ensure WeeksAdapter calls notifyDataSetChanged when needed" into klp-dev

* commit '56a87f8c':
  Ensure WeeksAdapter calls notifyDataSetChanged when needed
parents 0741bdef 56a87f8c

core/java/android/widget/CalendarView.java

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

                UNSCALED_WEEK_SEPARATOR_LINE_WIDTH, displayMetrics);



        LayoutInflater layoutInflater = (LayoutInflater) mContext

        LayoutInflater layoutInflater = (LayoutInflater) context

                .getSystemService(Service.LAYOUT_INFLATER_SERVICE);

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

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

        mFirstDayOfWeek = firstDayOfWeek;

        mAdapter.init();

        mAdapter.notifyDataSetChanged();

        setUpHeader();

    }
@@ -941,7 +940,7 @@ public class CalendarView extends FrameLayout { 
    }



    private void updateDateTextSize() {

        TypedArray dateTextAppearance = getContext().obtainStyledAttributes(

        TypedArray dateTextAppearance = mContext.obtainStyledAttributes(

                mDateTextAppearanceResId, R.styleable.TextAppearance);

        mDateTextSize = dateTextAppearance.getDimensionPixelSize(

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

    private void setUpAdapter() {

        if (mAdapter == null) {

            mAdapter = new WeeksAdapter(getContext());

            mAdapter = new WeeksAdapter();

            mAdapter.registerDataSetObserver(new DataSetObserver() {

                @Override

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

     */

    private class WeeksAdapter extends BaseAdapter implements OnTouchListener {

        private final Calendar mSelectedDate = Calendar.getInstance();

        private final GestureDetector mGestureDetector;



        private int mSelectedWeek;



        private GestureDetector mGestureDetector;



        private int mFocusedMonth;



        private final Calendar mSelectedDate = Calendar.getInstance();



        private int mTotalWeekCount;



        public WeeksAdapter(Context context) {

            mContext = context;

        public WeeksAdapter() {

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

            init();

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

                mTotalWeekCount++;

            }

            notifyDataSetChanged();

        }



        /**