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

Commit 70499122 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix various bugs in DatePickerCalendarDelegate"" into lmp-dev

parents 386831dc 706b3547

core/java/android/widget/DatePicker.java

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


    @Override

    protected void onRestoreInstanceState(Parcelable state) {

        BaseSavedState ss = (BaseSavedState) state;

        SavedState ss = (SavedState) state;

        super.onRestoreInstanceState(ss.getSuperState());

        mDelegate.onRestoreInstanceState(ss);

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

            }

        }



        @Override

        public void dispatchRestoreInstanceState(SparseArray<Parcelable> container) {

            mDelegator.dispatchThawSelfOnly(container);

        }

    }



    /**
@@ -850,6 +845,11 @@ 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

+6 −1
Original line number Diff line number Diff line
@@ -528,6 +528,11 @@ 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);
@@ -552,7 +557,7 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate i 
    public void onRestoreInstanceState(Parcelable state) {

        SavedState ss = (SavedState) state;



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

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

        mCurrentView = ss.getCurrentView();

        mMinDate.setTimeInMillis(ss.getMinDate());

        mMaxDate.setTimeInMillis(ss.getMaxDate());