Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4eb3efc8 authored by Bjorn Bringert's avatar Bjorn Bringert
Browse files

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
parent ccc214b2

core/java/android/widget/AutoCompleteTextView.java

+6 −4
Original line number Diff line number Diff line
@@ -613,12 +613,14 @@ 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()) {

            } else if (event.getAction() == KeyEvent.ACTION_UP) {

                getKeyDispatcherState().handleUpEvent(event);

                if (event.isTracking() && !event.isCanceled()) {

                    dismissDropDown();

                    return true;

                }

            }

        }

        return super.onKeyPreIme(keyCode, event);

    }