commit 8c2cb6ff0811fe869690d25590d251efabd2d288
author Treehugger Robot <treehugger-gerrit@google.com> Tue Nov 14 19:35:20 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 14 19:35:20 2017 +0000
tree eeb4a931f7f3877dcc5f19ce5a686a3ddd4c3a52
parent 7e875df6955084bf0d8cf558a9355673e90c09d1
parent 10864b0fcbe5e4565bebf0690fc0c58153b4bea7

Merge "TimePickerDialog OTG keyboard entry discarded"

core/java/android/app/TimePickerDialog.java

diff --git a/core/java/android/app/TimePickerDialog.java b/core/java/android/app/TimePickerDialog.java
index 0f006b6..8686944 100644
--- a/core/java/android/app/TimePickerDialog.java
+++ b/core/java/android/app/TimePickerDialog.java
@@ -152,6 +152,9 @@
             public void onClick(View view) {
                 if (mTimePicker.validateInput()) {
                     TimePickerDialog.this.onClick(TimePickerDialog.this, BUTTON_POSITIVE);
+                    // Clearing focus forces the dialog to commit any pending
+                    // changes, e.g. typed text in a NumberPicker.
+                    mTimePicker.clearFocus();
                     dismiss();
                 }
             }