diff options
| author | Alan Viverette <alanv@google.com> | 2014-12-01 19:12:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-01 19:12:49 +0000 |
| commit | 015b9e56d4ad528dd406672ef6264c85e41a20fd (patch) | |
| tree | e325dbd0fa3ecb67eb423239320c44c67014bc31 /core/java | |
| parent | b9ccc047ca9c1cd4f1c0143f230a4005fa4864a4 (diff) | |
| parent | d26276d9e39ed9d96102d41977de972d884bb7cd (diff) | |
| download | frameworks_base-015b9e56d4ad528dd406672ef6264c85e41a20fd.zip frameworks_base-015b9e56d4ad528dd406672ef6264c85e41a20fd.tar.gz frameworks_base-015b9e56d4ad528dd406672ef6264c85e41a20fd.tar.bz2 | |
Merge "Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked" into lmp-mr1-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/TimePickerDialog.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/TimePickerDialog.java b/core/java/android/app/TimePickerDialog.java index 6454367..3a2c21b 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; } } |