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

Commit 9c26b54d authored by Craig Mautner's avatar Craig Mautner
Browse files

Fix various bugs in DatePickerCalendarDelegate 

These bugs were exposed by cts DatePickerTest.

Fixes one item in 17459129.

Change-Id: Ifab52c6e6e760b75633aa4fe8ccf2d724f587e09
parent 645df3e3

core/java/android/widget/DatePicker.java

+6 −6
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ public class DatePicker extends FrameLayout { 


    @Override

    protected void onRestoreInstanceState(Parcelable state) {

        SavedState ss = (SavedState) state;

        BaseSavedState ss = (BaseSavedState) state;

        super.onRestoreInstanceState(ss.getSuperState());

        mDelegate.onRestoreInstanceState(ss);

    }
@@ -504,6 +504,11 @@ public class DatePicker extends FrameLayout { 
                mValidationCallback.onValidationChanged(valid);

            }

        }



        @Override

        public void dispatchRestoreInstanceState(SparseArray<Parcelable> container) {

            mDelegator.dispatchThawSelfOnly(container);

        }

    }



    /**
@@ -847,11 +852,6 @@ public class DatePicker extends FrameLayout { 
            setCurrentLocale(newConfig.locale);

        }



        @Override

        public void dispatchRestoreInstanceState(SparseArray<Parcelable> container) {

            mDelegator.dispatchThawSelfOnly(container);

        }



        @Override

        public Parcelable onSaveInstanceState(Parcelable superState) {

            return new SavedState(superState, getYear(), getMonth(), getDayOfMonth());

core/java/android/widget/DatePickerCalendarDelegate.java

+1 −6
Original line number Diff line number Diff line
@@ -528,11 +528,6 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate i 
        mDayFormat = new SimpleDateFormat("d", newConfig.locale);

    }



    @Override

    public void dispatchRestoreInstanceState(SparseArray<Parcelable> container) {

        // Nothing to do

    }



    @Override

    public Parcelable onSaveInstanceState(Parcelable superState) {

        final int year = mCurrentDate.get(Calendar.YEAR);
@@ -557,7 +552,7 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate i 
    public void onRestoreInstanceState(Parcelable state) {

        SavedState ss = (SavedState) state;



        mCurrentDate.set(ss.getSelectedDay(), ss.getSelectedMonth(), ss.getSelectedYear());

        mCurrentDate.set(ss.getSelectedYear(), ss.getSelectedMonth(), ss.getSelectedDay());

        mCurrentView = ss.getCurrentView();

        mMinDate.setTimeInMillis(ss.getMinDate());

        mMaxDate.setTimeInMillis(ss.getMaxDate());