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

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

Merge "Restore changes that were needed." into lmp-dev

parents dc7df649 a67d9095

core/java/android/widget/DatePicker.java

+1 −6
Original line number Diff line number Diff line
@@ -405,7 +405,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);

    }
@@ -845,11 +845,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());