summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alan Viverette <alanv@google.com> 2014-12-01 20:00:49 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-12-01 20:00:49 +0000
commit02cd927dffa24479a0ca29b40ead7b28f9e60a7c (patch)
tree08c9753a2419121ce1685685fe322c2e2cd3aa4d
parent8dd80c52b09f64a11752941a4d9a30c7e520a9da (diff)
parent53644fb5acd394b875723b6483215ba837f8e6c0 (diff)
am 53644fb5: am 015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev
* commit '53644fb5acd394b875723b6483215ba837f8e6c0': Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
-rw-r--r--core/java/android/app/TimePickerDialog.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/TimePickerDialog.java b/core/java/android/app/TimePickerDialog.java
index 64543673dc8a..3a2c21b13dfd 100644
--- a/core/java/android/app/TimePickerDialog.java
+++ b/core/java/android/app/TimePickerDialog.java
@@ -134,6 +134,9 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,
mTimePicker.getCurrentMinute());
}
break;
+ case BUTTON_NEGATIVE:
+ cancel();
+ break;
}
}