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

am 880d88b3: Merge "Restore changes that were needed." into lmp-dev

Browse Source 
* commit '880d88b308c73a598578f39892a3f01c201d9314':
  Restore changes that were needed.
This commit is contained in:
Craig Mautner
2014-09-16 23:00:11 +00:00
committed by Android Git Automerger
parent d56c257116 fb1bf84165
commit ea0dbf3fa2
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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