Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a59d91d5 authored by Adam Powell's avatar Adam Powell Committed by android-build-merger
Browse files

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

am: 7f517b2f

Change-Id: Ifb028e4be2e1657a5a1e7e39b23a981bc21d26f5
parents 74877d44 7f517b2f

core/java/android/widget/DatePickerCalendarDelegate.java

+1 −0
Original line number Diff line number Diff line
@@ -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.

core/java/android/widget/DatePickerSpinnerDelegate.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {

core/java/android/widget/TimePickerClockDelegate.java

+1 −0
Original line number Diff line number Diff line
@@ -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());

core/java/android/widget/TimePickerSpinnerDelegate.java

+2 −1
Original line number Diff line number Diff line
@@ -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);