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

Commit e6560741 authored by Hyejin Kim's avatar Hyejin Kim Committed by DvTonder
Browse files

change "next" to "done" in minute IME option under 24-hour format 

We don't need "next" button under 24-hour format any more.
So, we changed from "next" button to "done" in IME option
when setting minute under 24-hour format

AOSP commit: https://android-review.googlesource.com/#/c/54121/3

Change-Id: Ic9b1673248183060ba7279b63648a85dc39ca3b9
parent 0cdd2dca

core/java/android/widget/TimePicker.java

+10 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ public class TimePicker extends FrameLayout { 


        // update controls to initial state

        updateHourControl();

        updateMinuteControl();

        updateAmPmControl();



        setOnTimeChangedListener(NO_OP_CHANGE_LISTENER);
@@ -428,6 +429,7 @@ public class TimePicker extends FrameLayout { 
        updateHourControl();

        // set value after spinner range is updated

        setCurrentHour(currentHour);

        updateMinuteControl();

        updateAmPmControl();

    }
@@ -508,6 +510,14 @@ public class TimePicker extends FrameLayout { 
        }

    }



    private void updateMinuteControl() {

        if (is24HourView()) {

            mMinuteSpinnerInput.setImeOptions(EditorInfo.IME_ACTION_DONE);

        } else {

            mMinuteSpinnerInput.setImeOptions(EditorInfo.IME_ACTION_NEXT);

        }

    }



    private void updateAmPmControl() {

        if (is24HourView()) {

            if (mAmPmSpinner != null) {