Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7194361c: Merge "Properly handle dispatchRestoreInstanceState for new-style DatePicker" into lmp-dev

Browse Source 
* commit '7194361cdaad9150f8440dda99ccdc04556e73e2':
  Properly handle dispatchRestoreInstanceState for new-style DatePicker
This commit is contained in:
Alan Viverette
2014-09-16 18:00:39 +00:00
committed by Android Git Automerger
parent b6f3e6eb7b 328c630ab6
commit e8e61c5438
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/widget/DatePicker.java
View File

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

7
core/java/android/widget/DatePickerCalendarDelegate.java
View File

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