diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-07 01:55:33 -0400 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-07 01:55:33 -0400 |
commit | 4625758d0b909ccfc9f40b707666b1b21e9e8ffd (patch) | |
tree | 9bdda42c954f783ea9f95bd35a4ae649fcb7ad83 /core/java/android | |
parent | f038004f4a5e4fab18df9c87573ba1e82790c30f (diff) | |
parent | 4eb3efc8b270d2569fd813546f85add92e7f0ab0 (diff) | |
download | frameworks_base-4625758d0b909ccfc9f40b707666b1b21e9e8ffd.zip frameworks_base-4625758d0b909ccfc9f40b707666b1b21e9e8ffd.tar.gz frameworks_base-4625758d0b909ccfc9f40b707666b1b21e9e8ffd.tar.bz2 |
Merge change I2c5f1e76 into eclair
* changes:
Fix back button handling in ACTV
Diffstat (limited to 'core/java/android')
-rw-r--r-- | core/java/android/widget/AutoCompleteTextView.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java index 1449ea5..75d0f31 100644 --- a/core/java/android/widget/AutoCompleteTextView.java +++ b/core/java/android/widget/AutoCompleteTextView.java @@ -613,10 +613,12 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe && event.getRepeatCount() == 0) { getKeyDispatcherState().startTracking(event, this); return true; - } else if (event.getAction() == KeyEvent.ACTION_UP - && event.isTracking() && !event.isCanceled()) { - dismissDropDown(); - return true; + } else if (event.getAction() == KeyEvent.ACTION_UP) { + getKeyDispatcherState().handleUpEvent(event); + if (event.isTracking() && !event.isCanceled()) { + dismissDropDown(); + return true; + } } } return super.onKeyPreIme(keyCode, event); |