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

Commit 87545c5a authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Clean up nullable listeners in date and time picker delegates" into lmp-dev

parents 8e28c9c3 9468c6a2

core/java/android/widget/DatePickerCalendarDelegate.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -386,7 +386,9 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate i 
        mCurrentDate.set(Calendar.YEAR, year);

        mCurrentDate.set(Calendar.YEAR, year);

        mCurrentDate.set(Calendar.MONTH, month);

        mCurrentDate.set(Calendar.MONTH, month);

        mCurrentDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);

        mCurrentDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);

        if (mDateChangedListener != null) {

            mDateChangedListener.onDateChanged(mDelegator, year, month, dayOfMonth);

            mDateChangedListener.onDateChanged(mDelegator, year, month, dayOfMonth);

        }

        updateDisplay(false);

        updateDisplay(false);

    }

    }

core/java/android/widget/TimePickerClockDelegate.java

+0 −12
Original line number Original line Diff line number Diff line
@@ -73,16 +73,6 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate { 
    private boolean mHourWithTwoDigit;

    private boolean mHourWithTwoDigit;

    private char mHourFormat;

    private char mHourFormat;





    /**

     * A no-op callback used in the constructor to avoid null checks later in

     * the code.

     */

    private static final TimePicker.OnTimeChangedListener NO_OP_CHANGE_LISTENER =

            new TimePicker.OnTimeChangedListener() {

                public void onTimeChanged(TimePicker view, int hourOfDay, int minute) {

                }

            };



    public TimePickerClockDelegate(TimePicker delegator, Context context, AttributeSet attrs,

    public TimePickerClockDelegate(TimePicker delegator, Context context, AttributeSet attrs,

            int defStyleAttr, int defStyleRes) {

            int defStyleAttr, int defStyleRes) {

        super(delegator, context);

        super(delegator, context);
@@ -216,8 +206,6 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate { 
        updateMinuteControl();

        updateMinuteControl();

        updateAmPmControl();

        updateAmPmControl();





        setOnTimeChangedListener(NO_OP_CHANGE_LISTENER);



        // set to current time

        // set to current time

        setCurrentHour(mTempCalendar.get(Calendar.HOUR_OF_DAY));

        setCurrentHour(mTempCalendar.get(Calendar.HOUR_OF_DAY));

        setCurrentMinute(mTempCalendar.get(Calendar.MINUTE));

        setCurrentMinute(mTempCalendar.get(Calendar.MINUTE));