Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am fa6d6256: Merge "change "next" to "done" in minute IME option under 24-hour format"

Browse Source 
* commit 'fa6d6256e9052a5f5155ac97364170f6518e37a4':
  change "next" to "done" in minute IME option under 24-hour format
This commit is contained in:
Elliott Hughes
2013-06-05 16:23:34 -07:00
committed by Android Git Automerger
parent b18841b442 fa6d6256e9
commit 4d33a8aba3
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/widget/TimePicker.java
View File

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