Merge "Properly handle dispatchRestoreInstanceState for new-style DatePicker" into lmp-dev (328c630a) · Commits · e / os / android_frameworks_base

core/java/android/widget/DatePicker.java

+2 −9

Original line number	Diff line number	Diff line
		@@ -392,10 +392,9 @@ public class DatePicker extends FrameLayout {
		mDelegate.setSpinnersShown(shown);
		}

		// Override so we are in complete control of save / restore for this widget.
		@Override
		protected void dispatchRestoreInstanceState(SparseArray<Parcelable> container) {
		mDelegate.dispatchRestoreInstanceState(container);
		dispatchThawSelfOnly(container);
		}

		@Override
		@@ -406,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);
		}
		@@ -452,7 +451,6 @@ public class DatePicker extends FrameLayout {

		void onConfigurationChanged(Configuration newConfig);

		void dispatchRestoreInstanceState(SparseArray<Parcelable> container);
		Parcelable onSaveInstanceState(Parcelable superState);
		void onRestoreInstanceState(Parcelable state);

		@@ -847,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());

+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());