commit 2cc3b3e8e08b484fa6b228dcdf8025aa8ea99c08
author Makoto Onuki <omakoto@google.com> Mon Jul 11 14:54:39 2011 -0700
committer Makoto Onuki <omakoto@google.com> Wed Jul 13 12:55:33 2011 -0700
tree 43e66ddbb5e05d37319d85b81675cbf0b6be3493
parent adc1df97d7cb78bf3d9ec6effd8fbaf7391cc7a1

PeopleActivity: Remove context menu code

We don't use it any more, do we?

Change-Id: Id9afd3d9ea45a5de0f36065b054ee05d0974c6f4

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

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index e11755b..74f05c2 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -34,7 +34,6 @@
 import com.android.contacts.interactions.ImportExportDialogFragment;
 import com.android.contacts.interactions.PhoneNumberInteraction;
 import com.android.contacts.list.AccountFilterActivity;
-import com.android.contacts.list.ContactBrowseListContextMenuAdapter;
 import com.android.contacts.list.ContactBrowseListFragment;
 import com.android.contacts.list.ContactEntryListFragment;
 import com.android.contacts.list.ContactListFilter;
@@ -57,7 +56,6 @@
 import com.android.contacts.util.AccountsListAdapter;
 import com.android.contacts.util.DialogManager;
 import com.android.contacts.util.PhoneCapabilityTester;
-import com.android.contacts.widget.ContextMenuAdapter;
 
 import android.accounts.Account;
 import android.app.Activity;
@@ -86,7 +84,6 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.Window;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListPopupWindow;
@@ -300,10 +297,6 @@
             mFavoritesFragment.setListener(mFavoritesFragmentListener);
 
             mAllFragment.setOnContactListActionListener(new ContactBrowserActionListener());
-            if (!getWindow().hasFeature(Window.FEATURE_ACTION_BAR)) {
-                mAllFragment.setContextMenuAdapter(
-                        new ContactBrowseListContextMenuAdapter(mAllFragment));
-            }
 
             mGroupsFragment.setListener(new GroupBrowserActionListener());
 
@@ -1332,16 +1325,6 @@
     }
 
     @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        ContextMenuAdapter menuAdapter = mAllFragment.getContextMenuAdapter();
-        if (menuAdapter != null) {
-            return menuAdapter.onContextItemSelected(item);
-        }
-
-        return super.onContextItemSelected(item);
-    }
-
-    @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         // TODO move to the fragment
         switch (keyCode) {

src/com/android/contacts/list/ContactBrowseListContextMenuAdapter.java

diff --git a/src/com/android/contacts/list/ContactBrowseListContextMenuAdapter.java b/src/com/android/contacts/list/ContactBrowseListContextMenuAdapter.java
index f2a53ca..135fbc6 100644
--- a/src/com/android/contacts/list/ContactBrowseListContextMenuAdapter.java
+++ b/src/com/android/contacts/list/ContactBrowseListContextMenuAdapter.java
@@ -30,6 +30,8 @@
 
 /**
  * A contextual menu adapter for the basic contact list.
+ *
+ * TODO Not used any more.  Remove it.
  */
 public class ContactBrowseListContextMenuAdapter implements ContextMenuAdapter {