commit 1c89efe5953c7d7d251cb615b0077216dfffbd3c
author Isaac Katzenelson <isaack@android.com> Fri Aug 26 10:49:20 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 26 10:49:20 2011 -0700
tree e8e2c2c98b8b11adcfd80e72e6a6656ca6e4a641
parent afe8b8cdf6dda43397dbb57a0c5bbed3984051dd
parent 80243fd6a57c77c218dd5de957358cdb6ffba009

Merge "Remove search from join activity"

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

diff --git a/src/com/android/contacts/activities/JoinContactActivity.java b/src/com/android/contacts/activities/JoinContactActivity.java
index 7f22b18..725a9e7 100644
--- a/src/com/android/contacts/activities/JoinContactActivity.java
+++ b/src/com/android/contacts/activities/JoinContactActivity.java
@@ -136,34 +136,11 @@
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.search, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.menu_search: {
-                onSearchRequested();
-                return true;
-            }
-        }
+    public boolean onSearchRequested() {
         return false;
     }
 
     @Override
-    public void startSearch(String initialQuery, boolean selectInitialQuery, Bundle appSearchData,
-            boolean globalSearch) {
-        if (globalSearch) {
-            super.startSearch(initialQuery, selectInitialQuery, appSearchData, globalSearch);
-        } else {
-            mListFragment.startSearch(initialQuery);
-        }
-    }
-
-    @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == ContactEntryListFragment.ACTIVITY_REQUEST_CODE_PICKER
                 && resultCode == RESULT_OK) {