Merge "Remove plain_contact_photo, as QuickContactBadge can take over now"
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index dc0d9e1..fbb8d41 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -46,14 +46,6 @@
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/call_log_inner_margin"
/>
- <ImageView
- android:id="@+id/plain_contact_photo"
- android:layout_width="@dimen/call_log_list_contact_photo_size"
- android:layout_height="@dimen/call_log_list_contact_photo_size"
- android:layout_alignParentLeft="true"
- android:layout_centerVertical="true"
- android:layout_marginLeft="@dimen/call_log_inner_margin"
- />
<LinearLayout
android:id="@+id/divider"
android:layout_width="wrap_content"
diff --git a/src/com/android/contacts/calllog/CallLogFragment.java b/src/com/android/contacts/calllog/CallLogFragment.java
index c2c7c12..c06b474 100644
--- a/src/com/android/contacts/calllog/CallLogFragment.java
+++ b/src/com/android/contacts/calllog/CallLogFragment.java
@@ -662,8 +662,6 @@
CallLogListItemViews views = CallLogListItemViews.fromView(view);
views.callView.setOnClickListener(mCallPlayOnClickListener);
views.playView.setOnClickListener(mCallPlayOnClickListener);
- // Do nothing when a plain photo is clicked. Without this, the list item will fire.
- views.plainPhotoView.setOnClickListener(null);
view.setTag(views);
}
@@ -801,18 +799,9 @@
private void setPhoto(CallLogListItemViews views, Uri thumbnailUri, long contactId,
String lookupKey) {
- if (contactId == -1) {
- // This does not correspond to a contact, do not use the QuickContactBadge.
- mContactPhotoManager.loadPhoto(views.plainPhotoView, thumbnailUri);
- views.plainPhotoView.setVisibility(View.VISIBLE);
- views.quickContactView.setVisibility(View.INVISIBLE);
- } else {
- views.quickContactView.assignContactUri(
- Contacts.getLookupUri(contactId, lookupKey));
- mContactPhotoManager.loadPhoto(views.quickContactView, thumbnailUri);
- views.quickContactView.setVisibility(View.VISIBLE);
- views.plainPhotoView.setVisibility(View.INVISIBLE);
- }
+ views.quickContactView.assignContactUri(contactId == -1 ? null :
+ Contacts.getLookupUri(contactId, lookupKey));
+ mContactPhotoManager.loadPhoto(views.quickContactView, thumbnailUri);
}
/**
diff --git a/src/com/android/contacts/calllog/CallLogListItemViews.java b/src/com/android/contacts/calllog/CallLogListItemViews.java
index 368a868..21f2dc5 100644
--- a/src/com/android/contacts/calllog/CallLogListItemViews.java
+++ b/src/com/android/contacts/calllog/CallLogListItemViews.java
@@ -21,7 +21,6 @@
import android.content.Context;
import android.view.View;
-import android.widget.ImageView;
import android.widget.QuickContactBadge;
import android.widget.TextView;
@@ -31,8 +30,6 @@
public final class CallLogListItemViews {
/** The quick contact badge for the contact. */
public final QuickContactBadge quickContactView;
- /** The photo view without quick contact badge. */
- public final ImageView plainPhotoView;
/** The main action button on the entry. */
public final View callView;
/** The play action button used for voicemail. */
@@ -48,12 +45,11 @@
/** The text of the header in a stand-alone row, or null for other types of rows. */
public final TextView listHeaderTextView;
- private CallLogListItemViews(QuickContactBadge quickContactView, ImageView photoView,
+ private CallLogListItemViews(QuickContactBadge quickContactView,
View callView, View playView, View unheardView, View dividerView,
PhoneCallDetailsViews phoneCallDetailsViews, View listItemView,
TextView listHeaderTextView) {
this.quickContactView = quickContactView;
- this.plainPhotoView = photoView;
this.callView = callView;
this.playView = playView;
this.unheardView = unheardView;
@@ -66,7 +62,6 @@
public static CallLogListItemViews fromView(View view) {
return new CallLogListItemViews(
(QuickContactBadge) view.findViewById(R.id.quick_contact_photo),
- (ImageView) view.findViewById(R.id.plain_contact_photo),
view.findViewById(R.id.call_icon),
view.findViewById(R.id.play_icon),
view.findViewById(R.id.unheard_icon),
@@ -79,7 +74,6 @@
public static CallLogListItemViews createForTest(Context context) {
return new CallLogListItemViews(
new QuickContactBadge(context),
- new ImageView(context),
new View(context),
new View(context),
new View(context),
diff --git a/tests/src/com/android/contacts/activities/CallLogActivityTests.java b/tests/src/com/android/contacts/activities/CallLogActivityTests.java
index 827bd37..7043eb0 100644
--- a/tests/src/com/android/contacts/activities/CallLogActivityTests.java
+++ b/tests/src/com/android/contacts/activities/CallLogActivityTests.java
@@ -281,8 +281,7 @@
mAdapter.bindStandAloneView(view, getActivity(), mCursor);
CallLogListItemViews views = (CallLogListItemViews) view.getTag();
- assertEquals(View.VISIBLE, views.quickContactView.getVisibility());
- assertEquals(View.INVISIBLE, views.plainPhotoView.getVisibility());
+ assertTrue(views.quickContactView.isEnabled());
}
@MediumTest
@@ -293,8 +292,7 @@
mAdapter.bindStandAloneView(view, getActivity(), mCursor);
CallLogListItemViews views = (CallLogListItemViews) view.getTag();
- assertEquals(View.INVISIBLE, views.quickContactView.getVisibility());
- assertEquals(View.VISIBLE, views.plainPhotoView.getVisibility());
+ assertFalse(views.quickContactView.isEnabled());
}
@MediumTest