Merge change I2c5f1e76 into eclair

* changes:
  Fix back button handling in ACTV

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);