Merge "change "next" to "done" in minute IME option under 24-hour format" (fa6d6256) · Commits · e / os / android_frameworks_base

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) {