Don't bring up the search UI while editing a field
Change-Id: I50fb06d275801fbf57e220861444c2f9d5a1bc73
diff --git a/src/com/android/contacts/activities/ContactBrowserActivity.java b/src/com/android/contacts/activities/ContactBrowserActivity.java
index 0f7d96c..f50d16a 100644
--- a/src/com/android/contacts/activities/ContactBrowserActivity.java
+++ b/src/com/android/contacts/activities/ContactBrowserActivity.java
@@ -51,6 +51,7 @@
import android.provider.ContactsContract.Contacts;
import android.provider.Settings;
import android.text.TextUtils;
+import android.util.Log;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuInflater;
@@ -760,32 +761,6 @@
return super.onContextItemSelected(item);
}
- /**
- * Event handler for the use case where the user starts typing without
- * bringing up the search UI first.
- */
- @Override
- public boolean dispatchKeyEvent(KeyEvent event) {
- int unicodeChar = event.getUnicodeChar();
- if (unicodeChar != 0) {
- String query = new String(new int[]{unicodeChar}, 0, 1);
- if (mTwoPaneLayout) {
- if (mNavigationBar.getMode() != NavigationBar.MODE_SEARCH) {
- mNavigationBar.setQueryString(query);
- mNavigationBar.setMode(NavigationBar.MODE_SEARCH);
- return true;
- }
- } else if (!mRequest.isSearchMode()) {
- if (!mSearchInitiated) {
- mSearchInitiated = true;
- startSearch(query, false, null, false);
- return true;
- }
- }
- }
- return super.dispatchKeyEvent(event);
- }
-
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
// TODO move to the fragment
@@ -803,6 +778,27 @@
}
break;
}
+ default: {
+ // Bring up the search UI if the user starts typing
+ final int unicodeChar = event.getUnicodeChar();
+
+ if (unicodeChar != 0) {
+ String query = new String(new int[]{ unicodeChar }, 0, 1);
+ if (mTwoPaneLayout) {
+ if (mNavigationBar.getMode() != NavigationBar.MODE_SEARCH) {
+ mNavigationBar.setQueryString(query);
+ mNavigationBar.setMode(NavigationBar.MODE_SEARCH);
+ return true;
+ }
+ } else if (!mRequest.isSearchMode()) {
+ if (!mSearchInitiated) {
+ mSearchInitiated = true;
+ startSearch(query, false, null, false);
+ return true;
+ }
+ }
+ }
+ }
}
return super.onKeyDown(keyCode, event);