Don't show QuickContacts in ContactDetails
Bug:3060228
Change-Id: Ic5a1fd3ffb87b8154879608ac86eb8d487df5ed0
diff --git a/res/layout-xlarge/contact_detail_header_view.xml b/res/layout-xlarge/contact_detail_header_view.xml
index be86255..3299b34 100644
--- a/res/layout-xlarge/contact_detail_header_view.xml
+++ b/res/layout-xlarge/contact_detail_header_view.xml
@@ -22,7 +22,7 @@
android:paddingTop="40dip"
android:paddingRight="5dip">
- <android.widget.QuickContactBadge android:id="@+id/photo"
+ <ImageView android:id="@+id/photo"
android:layout_marginRight="8dip"
android:layout_marginLeft="-1dip"
android:layout_width="96dip"
diff --git a/res/layout/contact_detail_header_view.xml b/res/layout/contact_detail_header_view.xml
index b7c7988..2417e45 100644
--- a/res/layout/contact_detail_header_view.xml
+++ b/res/layout/contact_detail_header_view.xml
@@ -22,11 +22,11 @@
android:background="@drawable/title_bar_medium"
android:paddingRight="5dip">
- <android.widget.QuickContactBadge android:id="@+id/photo"
+ <ImageView android:id="@+id/photo"
android:layout_gravity="center_vertical"
android:layout_marginRight="8dip"
android:layout_marginLeft="-1dip"
- style="@*android:style/Widget.QuickContactBadge.WindowSmall" />
+ android:src="@*android:drawable/ic_contact_picture"
/>
<LinearLayout
diff --git a/src/com/android/contacts/views/detail/ContactDetailFragment.java b/src/com/android/contacts/views/detail/ContactDetailFragment.java
index b456f59..ab22995 100644
--- a/src/com/android/contacts/views/detail/ContactDetailFragment.java
+++ b/src/com/android/contacts/views/detail/ContactDetailFragment.java
@@ -190,9 +190,6 @@
mInflater = inflater;
mHeaderView = (ContactDetailHeaderView) view.findViewById(R.id.contact_header_widget);
- mHeaderView.setExcludeMimes(new String[] {
- Contacts.CONTENT_ITEM_TYPE
- });
mHeaderView.setListener(mHeaderViewListener);
mListView = (ListView) view.findViewById(android.R.id.list);
diff --git a/src/com/android/contacts/views/detail/ContactDetailHeaderView.java b/src/com/android/contacts/views/detail/ContactDetailHeaderView.java
index 8ac9ce7..16a2320 100644
--- a/src/com/android/contacts/views/detail/ContactDetailHeaderView.java
+++ b/src/com/android/contacts/views/detail/ContactDetailHeaderView.java
@@ -43,7 +43,6 @@
import android.view.View;
import android.widget.CheckBox;
import android.widget.ImageButton;
-import android.widget.QuickContactBadge;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
@@ -60,7 +59,7 @@
private TextView mDisplayNameView;
private TextView mPhoneticNameView;
private CheckBox mStarredView;
- private QuickContactBadge mPhotoView;
+ private ImageView mPhotoView;
private ImageView mPresenceView;
private View mStatusContainerView;
private TextView mStatusView;
@@ -100,7 +99,7 @@
mStarredView = (CheckBox)findViewById(R.id.star);
mStarredView.setOnClickListener(this);
- mPhotoView = (QuickContactBadge) findViewById(R.id.photo);
+ mPhotoView = (ImageView) findViewById(R.id.photo);
mPresenceView = (ImageView) findViewById(R.id.presence);
mStatusContainerView = findViewById(R.id.status_container);
@@ -116,7 +115,6 @@
*/
public void loadData(ContactLoader.Result contactData) {
mContactUri = contactData.getLookupUri();
- mPhotoView.assignContactUri(contactData.getLookupUri());
setDisplayName(contactData.getDisplayName(), contactData.getPhoneticName());
setPhoto(findPhoto(contactData));
@@ -241,15 +239,6 @@
}
/**
- * Set a list of specific MIME-types to exclude and not display. For
- * example, this can be used to hide the {@link Contacts#CONTENT_ITEM_TYPE}
- * profile icon.
- */
- public void setExcludeMimes(String[] excludeMimes) {
- mPhotoView.setExcludeMimes(excludeMimes);
- }
-
- /**
* Set all the status values to display in the header.
* @param status The status of the contact. If this is either null or empty,
* the status is cleared and the other parameters are ignored.