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

Commit 6d7771b5 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #10462461 CTS TimePickerTest are broken for... 

Merge "Fix bug #10462461 CTS TimePickerTest are broken for testSetOnTimeChangedListener()" into klp-dev
parents aeda265c 138de8e1

core/java/android/widget/TimePicker.java

+11 −3
Original line number Diff line number Diff line
@@ -443,6 +443,10 @@ public class TimePicker extends FrameLayout { 
     * Set the current hour.

     */

    public void setCurrentHour(Integer currentHour) {

        setCurrentHour(currentHour, true);

    }



    private void setCurrentHour(Integer currentHour, boolean notifyTimeChanged) {

        // why was Integer used in the first place?

        if (currentHour == null || currentHour == getCurrentHour()) {

            return;
@@ -463,8 +467,10 @@ public class TimePicker extends FrameLayout { 
            updateAmPmControl();

        }

        mHourSpinner.setValue(currentHour);

        if (notifyTimeChanged) {

            onTimeChanged();

        }

    }



    /**

     * Set whether in 24 hour or AM/PM mode.
@@ -481,8 +487,10 @@ public class TimePicker extends FrameLayout { 
        mIs24HourView = is24HourView;

        getHourFormatData();

        updateHourControl();

        // set value after spinner range is updated

        setCurrentHour(currentHour);

        // set value after spinner range is updated - be aware that because mIs24HourView has

        // changed then getCurrentHour() is not equal to the currentHour we cached before so

        // explicitly ask for *not* propagating any onTimeChanged()

        setCurrentHour(currentHour, false /* no onTimeChanged() */);

        updateMinuteControl();

        updateAmPmControl();

    }