From 4eb3efc8b270d2569fd813546f85add92e7f0ab0 Mon Sep 17 00:00:00 2001 From: Bjorn Bringert Date: Tue, 6 Oct 2009 09:26:06 +0100 Subject: Fix back button handling in ACTV AutoCompleteTextView.onKeyPreIme() used getKeyDispatcherState().startTracking(event, this) to start tracking the back button, but didn't update the state of the event before checking event.isTracking(). Fixes http://b/issue?id=2167168 "AutoCompleteTextView back button handling is broken" Change-Id: I2c5f1e761872b9e02d85ff6f958fabd558d041a0 --- core/java/android/widget/AutoCompleteTextView.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'core/java/android/widget') 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); -- cgit v1.1