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

Merge "Disable state save/restore for inflated date/time picker views" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-24 19:50:51 +00:00
committed by Android (Google) Code Review
parent 4d3d035255 43da25c670
commit 7f517b2fe6
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,6 +112,7 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate {
// Set up and attach container.
mContainer = (ViewGroup) inflater.inflate(layoutResourceId, mDelegator, false);
mContainer.setSaveFromParentEnabled(false);
mDelegator.addView(mContainer);
// Set up header views.

3
core/java/android/widget/DatePickerSpinnerDelegate.java
View File

@@ -115,7 +115,8 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate {
LayoutInflater inflater = (LayoutInflater) context
.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
inflater.inflate(layoutResourceId, mDelegator, true);
final View view = inflater.inflate(layoutResourceId, mDelegator, true);
view.setSaveFromParentEnabled(false);
OnValueChangeListener onChangeListener = new OnValueChangeListener() {
public void onValueChange(NumberPicker picker, int oldVal, int newVal) {

1
core/java/android/widget/TimePickerClockDelegate.java
View File

@@ -137,6 +137,7 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate {
final int layoutResourceId = a.getResourceId(R.styleable.TimePicker_internalLayout,
R.layout.time_picker_material);
final View mainView = inflater.inflate(layoutResourceId, delegator);
mainView.setSaveFromParentEnabled(false);
mRadialTimePickerHeader = mainView.findViewById(R.id.time_header);
mRadialTimePickerHeader.setOnTouchListener(new NearestTouchDelegate());

3
core/java/android/widget/TimePickerSpinnerDelegate.java
View File

@@ -83,7 +83,8 @@ class TimePickerSpinnerDelegate extends TimePicker.AbstractTimePickerDelegate {
a.recycle();
final LayoutInflater inflater = LayoutInflater.from(mContext);
inflater.inflate(layoutResourceId, mDelegator, true);
final View view = inflater.inflate(layoutResourceId, mDelegator, true);
view.setSaveFromParentEnabled(false);
// hour
mHourSpinner = delegator.findViewById(R.id.hour);