diff options
| -rw-r--r-- | core/java/android/widget/DatePicker.java | 11 | ||||
| -rw-r--r-- | core/java/android/widget/DatePickerCalendarDelegate.java | 7 |
2 files changed, 3 insertions, 15 deletions
diff --git a/core/java/android/widget/DatePicker.java b/core/java/android/widget/DatePicker.java index d77f0b2b6e8c..3e4eb021b565 100644 --- a/core/java/android/widget/DatePicker.java +++ b/core/java/android/widget/DatePicker.java @@ -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); @@ -848,11 +846,6 @@ public class DatePicker extends FrameLayout { } @Override - public void dispatchRestoreInstanceState(SparseArray<Parcelable> 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 b962962118cb..e71b38366baa 100644 --- a/core/java/android/widget/DatePickerCalendarDelegate.java +++ b/core/java/android/widget/DatePickerCalendarDelegate.java @@ -529,11 +529,6 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate i } @Override - public void dispatchRestoreInstanceState(SparseArray<Parcelable> container) { - // Nothing to do - } - - @Override public Parcelable onSaveInstanceState(Parcelable superState) { final int year = mCurrentDate.get(Calendar.YEAR); final int month = mCurrentDate.get(Calendar.MONTH); @@ -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()); |