commit 1332868ddb427a39d377b31d02d78baab3332d54
author Dmitri Plotnikov <dplotnikov@google.com> Fri Oct 08 13:41:44 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 08 13:41:44 2010 -0700
tree 0576fc3c64a74660dc5524cd371aea68a76fce54
parent 8b7d04ab402a0cc3f8aefe0301010c54d50b2c21
parent d94c3eb74137b723999542a66f32cc7ac79141ab

Merge "Disabling long-press in the contact list"

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

diff --git a/src/com/android/contacts/activities/ContactBrowserActivity.java b/src/com/android/contacts/activities/ContactBrowserActivity.java
index 149260f..27fdb60 100644
--- a/src/com/android/contacts/activities/ContactBrowserActivity.java
+++ b/src/com/android/contacts/activities/ContactBrowserActivity.java
@@ -442,7 +442,10 @@
                 DefaultContactBrowseListFragment fragment = new DefaultContactBrowseListFragment();
                 fragment.setContactsRequest(mRequest);
                 fragment.setOnContactListActionListener(new ContactBrowserActionListener());
-                fragment.setContextMenuAdapter(new ContactBrowseListContextMenuAdapter(fragment));
+                if (!mHasActionBar) {
+                    fragment.setContextMenuAdapter(
+                            new ContactBrowseListContextMenuAdapter(fragment));
+                }
                 fragment.setSearchMode(mRequest.isSearchMode());
                 fragment.setQueryString(mRequest.getQueryString());
                 fragment.setDirectorySearchEnabled(
@@ -496,7 +499,9 @@
     private ContactBrowseListFragment createContactSearchFragment() {
         DefaultContactBrowseListFragment fragment = new DefaultContactBrowseListFragment();
         fragment.setOnContactListActionListener(new ContactBrowserActionListener());
-        fragment.setContextMenuAdapter(new ContactBrowseListContextMenuAdapter(fragment));
+        if (!mHasActionBar) {
+            fragment.setContextMenuAdapter(new ContactBrowseListContextMenuAdapter(fragment));
+        }
         fragment.setSearchMode(true);
         fragment.setDirectorySearchEnabled(true);
         fragment.setDirectoryResultLimit(DEFAULT_DIRECTORY_RESULT_LIMIT);