From a67d9095b7731df3a6ae3f45738a2980151fd1af Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Tue, 16 Sep 2014 15:38:47 -0700 Subject: [PATCH] Restore changes that were needed. Reverting the changes in ag/548487 also reverted alanv's changes in ag/547793. This restores alanv's changes. Fixes build. Change-Id: Ifa2aa928a3ad29fe49e52dbec4e4833538dfe7e9 --- core/java/android/widget/DatePicker.java | 7 +------ core/java/android/widget/DatePickerCalendarDelegate.java | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/core/java/android/widget/DatePicker.java b/core/java/android/widget/DatePicker.java index f8f0944e8c152..3e4eb021b5655 100644 --- a/core/java/android/widget/DatePicker.java +++ b/core/java/android/widget/DatePicker.java @@ -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 container) { - mDelegator.dispatchThawSelfOnly(container); - } - @Override public Parcelable onSaveInstanceState(Parcelable superState) { return new SavedState(superState, getYear(), getMonth(), getDayOfMonth()); diff --git a/core/java/android/widget/DatePickerCalendarDelegate.java b/core/java/android/widget/DatePickerCalendarDelegate.java index b962962118cb9..e71b38366baa6 100644 --- a/core/java/android/widget/DatePickerCalendarDelegate.java +++ b/core/java/android/widget/DatePickerCalendarDelegate.java @@ -528,11 +528,6 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate i mDayFormat = new SimpleDateFormat("d", newConfig.locale); } - @Override - public void dispatchRestoreInstanceState(SparseArray 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());