commit 43fbbc1e5bbc295d0be5033a002e9f532fdfb119
author Makoto Onuki <omakoto@google.com> Thu Jul 14 16:12:14 2011 -0700
committer Makoto Onuki <omakoto@google.com> Thu Jul 14 16:17:15 2011 -0700
tree 90245c1d1f9f50411c771042efed210b3524eadc
parent a023ddd7788bc7cde35ca7bbeaf3edb99ff34441

Disable search key press on 1-pane detail/editor activities

These activities don't have the search menu item, so the search key shouldn't
work.
(The behavior was weird anyway... e.g. it worked differently on
ContactDetailActivity and GroupDetailActivity...)

Bug 5032530

Change-Id: If3504cbd3e5cf027d43eec68d8f89e41bd7d324c

src/com/android/contacts/activities/ContactDetailActivity.java

diff --git a/src/com/android/contacts/activities/ContactDetailActivity.java b/src/com/android/contacts/activities/ContactDetailActivity.java
index 7456967..0637fd5 100644
--- a/src/com/android/contacts/activities/ContactDetailActivity.java
+++ b/src/com/android/contacts/activities/ContactDetailActivity.java
@@ -174,11 +174,7 @@
     @Override
     public void startSearch(String initialQuery, boolean selectInitialQuery, Bundle appSearchData,
             boolean globalSearch) {
-        if (globalSearch) {
-            super.startSearch(initialQuery, selectInitialQuery, appSearchData, globalSearch);
-        } else {
-            ContactsSearchManager.startSearch(this, initialQuery);
-        }
+        // Ignore search key press
     }
 
     @Override

src/com/android/contacts/activities/ContactEditorActivity.java

diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java
index cc0be9d..1ee7f1d 100644
--- a/src/com/android/contacts/activities/ContactEditorActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorActivity.java
@@ -122,11 +122,7 @@
     @Override
     public void startSearch(String initialQuery, boolean selectInitialQuery, Bundle appSearchData,
             boolean globalSearch) {
-        if (globalSearch) {
-            super.startSearch(initialQuery, selectInitialQuery, appSearchData, globalSearch);
-        } else {
-            ContactsSearchManager.startSearch(this, initialQuery);
-        }
+        // Ignore search key press
     }
 
     @Override

src/com/android/contacts/activities/GroupDetailActivity.java

diff --git a/src/com/android/contacts/activities/GroupDetailActivity.java b/src/com/android/contacts/activities/GroupDetailActivity.java
index 7a74bfd..635c130 100644
--- a/src/com/android/contacts/activities/GroupDetailActivity.java
+++ b/src/com/android/contacts/activities/GroupDetailActivity.java
@@ -90,4 +90,10 @@
         }
         return super.onOptionsItemSelected(item);
     }
+
+    @Override
+    public void startSearch(String initialQuery, boolean selectInitialQuery, Bundle appSearchData,
+            boolean globalSearch) {
+        // Ignore search key press
+    }
 }

src/com/android/contacts/activities/GroupEditorActivity.java

diff --git a/src/com/android/contacts/activities/GroupEditorActivity.java b/src/com/android/contacts/activities/GroupEditorActivity.java
index fa41051..ecadcec 100644
--- a/src/com/android/contacts/activities/GroupEditorActivity.java
+++ b/src/com/android/contacts/activities/GroupEditorActivity.java
@@ -85,11 +85,7 @@
     @Override
     public void startSearch(String initialQuery, boolean selectInitialQuery, Bundle appSearchData,
             boolean globalSearch) {
-        if (globalSearch) {
-            super.startSearch(initialQuery, selectInitialQuery, appSearchData, globalSearch);
-        } else {
-            ContactsSearchManager.startSearch(this, initialQuery);
-        }
+        // Ignore search key press
     }
 
     @Override