commit 665357cfd5b164347ede65105fec872bc10215e9
author Daniel Lehmann <lehmannd@google.com> Fri Sep 10 19:58:48 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 10 19:58:48 2010 -0700
tree 8b2d9b8150cc5b14a1101ca4929a11546b982ff6
parent 30600adb359eb7e5ff1e7f4d57e9c0d26ea07263
parent 1624964ef877dc7d67452cbdacfb4d811c245c17

Merge "Fix "Make as default" (there was an Id clash)"

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 55e9e37..db04020 100644
--- a/src/com/android/contacts/activities/ContactBrowserActivity.java
+++ b/src/com/android/contacts/activities/ContactBrowserActivity.java
@@ -445,6 +445,7 @@
         fragment.setDirectorySearchEnabled(true);
         fragment.setAizyEnabled(false);
         fragment.setSelectionVisible(true);
+        fragment.setQuickContactEnabled(!mContactContentDisplayed);
         return fragment;
     }
 

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

diff --git a/src/com/android/contacts/list/StrequentContactListAdapter.java b/src/com/android/contacts/list/StrequentContactListAdapter.java
index 36d5fd8..712876e 100644
--- a/src/com/android/contacts/list/StrequentContactListAdapter.java
+++ b/src/com/android/contacts/list/StrequentContactListAdapter.java
@@ -16,6 +16,7 @@
 package com.android.contacts.list;
 
 import com.android.contacts.R;
+import com.android.contacts.util.PhoneCapabilityTester;
 
 import android.content.Context;
 import android.content.CursorLoader;
@@ -41,6 +42,7 @@
     private int mCallButtonId;
     private boolean mStarredContactsIncluded;
     private boolean mFrequentlyContactedContactsIncluded;
+    private boolean mIsPhone;
 
     public StrequentContactListAdapter(Context context, int callButtonId) {
         super(context);
@@ -89,6 +91,7 @@
         // Sometimes the adapter is invalidated without calling changeCursor,
         // need to reset the separator position then.
         mFrequentSeparatorPos = ListView.INVALID_POSITION;
+        mIsPhone = PhoneCapabilityTester.isPhone(getContext());
     }
 
     @Override
@@ -211,7 +214,7 @@
         bindPresence(view, cursor);
 
         // Make the call button visible if requested.
-        if (getHasPhoneNumber(position)) {
+        if (mIsPhone && getHasPhoneNumber(position)) {
             view.showCallButton(mCallButtonId, position);
         } else {
             view.hideCallButton();