Commit c51c5f29 authored Feb 22, 2017 by Aurimas Liutikas

Fix toggling of AM/PM of TimePicker using hardware keyboard.

Set AM/PM mode before setting hour in TextInputTimePickerView. This is
needed so we know exactly which it is when we are using 12 hour clock.
Not setting it early was causing TextInputTimePickerView to update TimePicker
with the hour that was not offset correctly based on AM/PM state.

Test: existing tests caught this - TimePickerTest#testKeyboardInputModeClockAmPm
      verified locally that this test now passes.
Bug: 35262830

Change-Id: I7e912320cb5a72c5d9d4e80dc0b42deb651f2636

parent ab7bc7af

core/java/android/widget/TextInputTimePickerView.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -177,15 +177,15 @@ public class TextInputTimePickerView extends RelativeLayout {

		mAmPmSpinner.setVisibility(is24Hour ? View.INVISIBLE : View.VISIBLE);

		mHourEditText.setText(String.format(format, localizedHour));
		mMinuteEditText.setText(String.format(format, minute));

		if (amOrPm == AM) {
		mAmPmSpinner.setSelection(0);
		} else {
		mAmPmSpinner.setSelection(1);
		}

		mHourEditText.setText(String.format(format, localizedHour));
		mMinuteEditText.setText(String.format(format, minute));

		if (mErrorShowing) {
		validateInput();
		}