Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't consume all BACK keys in SearchView" into pi-dev

Browse Source 
am: a1aa6abe36

Change-Id: Iea6535861725fea6096d9c44409436b8207594f0
This commit is contained in:
Evan Rosky
2018-03-08 00:40:17 +00:00
committed by android-build-merger
parent bde7a11af9 a1aa6abe36
commit c34bf94330
1 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/java/android/widget/SearchView.java
View File

@@ -1990,28 +1990,15 @@ public class SearchView extends LinearLayout implements CollapsibleActionView {
@Override
public boolean onKeyPreIme(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
// special case for the back key, we do not even try to send it
// to the drop down list but instead, consume it immediately
if (event.getAction() == KeyEvent.ACTION_DOWN && event.getRepeatCount() == 0) {
KeyEvent.DispatcherState state = getKeyDispatcherState();
if (state != null) {
state.startTracking(event, this);
}
return true;
} else if (event.getAction() == KeyEvent.ACTION_UP) {
KeyEvent.DispatcherState state = getKeyDispatcherState();
if (state != null) {
state.handleUpEvent(event);
}
if (event.isTracking() && !event.isCanceled()) {
mSearchView.clearFocus();
setImeVisibility(false);
return true;
}
}
final boolean consume = super.onKeyPreIme(keyCode, event);
if (consume && keyCode == KeyEvent.KEYCODE_BACK
&& event.getAction() == KeyEvent.ACTION_UP) {
// If AutoCompleteTextView closed its pop-up, it will return true, in which case
// we should also close the IME. Otherwise, the popup is already closed and we can
// leave the BACK event alone.
setImeVisibility(false);
}
return super.onKeyPreIme(keyCode, event);
return consume;
}
/**