diff options
3 files changed, 1 insertions, 15 deletions
diff --git a/src/com/android/contacts/calllog/CallLogListItemHelper.java b/src/com/android/contacts/calllog/CallLogListItemHelper.java index 5951ea3e2..602c283eb 100644 --- a/src/com/android/contacts/calllog/CallLogListItemHelper.java +++ b/src/com/android/contacts/calllog/CallLogListItemHelper.java @@ -65,17 +65,14 @@ import android.view.View; if (canPlay) { // Playback action takes preference. configurePlaySecondaryAction(views); - views.unheardView.setVisibility(isHighlighted ? View.VISIBLE : View.GONE); views.dividerView.setVisibility(View.VISIBLE); } else if (canCall) { // Call is the secondary action. configureCallSecondaryAction(views); - views.unheardView.setVisibility(View.GONE); views.dividerView.setVisibility(View.VISIBLE); } else { // No action available. views.secondaryActionView.setVisibility(View.GONE); - views.unheardView.setVisibility(View.GONE); views.dividerView.setVisibility(View.GONE); } } diff --git a/src/com/android/contacts/calllog/CallLogListItemViews.java b/src/com/android/contacts/calllog/CallLogListItemViews.java index a6edb694e..a2679e946 100644 --- a/src/com/android/contacts/calllog/CallLogListItemViews.java +++ b/src/com/android/contacts/calllog/CallLogListItemViews.java @@ -35,8 +35,6 @@ public final class CallLogListItemViews { public final View primaryActionView; /** The secondary action button on the entry. */ public final ImageView secondaryActionView; - /** The icon used for unheard voicemail. */ - public final View unheardView; /** The divider between the primary and secondary actions. */ public final View dividerView; /** The details of the phone call. */ @@ -49,13 +47,12 @@ public final class CallLogListItemViews { public final View bottomDivider; private CallLogListItemViews(QuickContactBadge quickContactView, View primaryActionView, - ImageView secondaryActionView, View unheardView, View dividerView, + ImageView secondaryActionView, View dividerView, PhoneCallDetailsViews phoneCallDetailsViews, View listItemView, TextView listHeaderTextView, View bottomDivider) { this.quickContactView = quickContactView; this.primaryActionView = primaryActionView; this.secondaryActionView = secondaryActionView; - this.unheardView = unheardView; this.dividerView = dividerView; this.phoneCallDetailsViews = phoneCallDetailsViews; this.listItemView = listItemView; @@ -68,7 +65,6 @@ public final class CallLogListItemViews { (QuickContactBadge) view.findViewById(R.id.quick_contact_photo), view.findViewById(R.id.primary_action_view), (ImageView) view.findViewById(R.id.secondary_action_icon), - view.findViewById(R.id.unheard_icon), view.findViewById(R.id.divider), PhoneCallDetailsViews.fromView(view), view.findViewById(R.id.call_log_item), @@ -82,7 +78,6 @@ public final class CallLogListItemViews { new View(context), new ImageView(context), new View(context), - new View(context), PhoneCallDetailsViews.createForTest(context), new View(context), new TextView(context), diff --git a/tests/src/com/android/contacts/calllog/CallLogListItemHelperTest.java b/tests/src/com/android/contacts/calllog/CallLogListItemHelperTest.java index 2c2960872..ce3c14f4b 100644 --- a/tests/src/com/android/contacts/calllog/CallLogListItemHelperTest.java +++ b/tests/src/com/android/contacts/calllog/CallLogListItemHelperTest.java @@ -75,7 +75,6 @@ public class CallLogListItemHelperTest extends AndroidTestCase { public void testSetPhoneCallDetails() { setPhoneCallDetailsWithNumber("12125551234", "1-212-555-1234"); assertEquals(View.VISIBLE, mViews.secondaryActionView.getVisibility()); - assertEquals(View.GONE, mViews.unheardView.getVisibility()); } public void testSetPhoneCallDetails_Unknown() { @@ -96,32 +95,27 @@ public class CallLogListItemHelperTest extends AndroidTestCase { public void testSetPhoneCallDetails_VoicemailNumber() { setPhoneCallDetailsWithNumber(TEST_VOICEMAIL_NUMBER, TEST_VOICEMAIL_NUMBER); assertEquals(View.VISIBLE, mViews.secondaryActionView.getVisibility()); - assertEquals(View.GONE, mViews.unheardView.getVisibility()); } public void testSetPhoneCallDetails_ReadVoicemail() { setPhoneCallDetailsWithTypes(Calls.VOICEMAIL_TYPE); assertEquals(View.VISIBLE, mViews.secondaryActionView.getVisibility()); - assertEquals(View.GONE, mViews.unheardView.getVisibility()); } public void testSetPhoneCallDetails_UnreadVoicemail() { setUnreadPhoneCallDetailsWithTypes(Calls.VOICEMAIL_TYPE); assertEquals(View.VISIBLE, mViews.secondaryActionView.getVisibility()); - assertEquals(View.VISIBLE, mViews.unheardView.getVisibility()); } public void testSetPhoneCallDetails_VoicemailFromUnknown() { setPhoneCallDetailsWithNumberAndType(CallerInfo.UNKNOWN_NUMBER, CallerInfo.UNKNOWN_NUMBER, Calls.VOICEMAIL_TYPE); assertEquals(View.VISIBLE, mViews.secondaryActionView.getVisibility()); - assertEquals(View.GONE, mViews.unheardView.getVisibility()); } /** Asserts that the whole call area is gone. */ private void assertNoCallButton() { assertEquals(View.GONE, mViews.secondaryActionView.getVisibility()); - assertEquals(View.GONE, mViews.unheardView.getVisibility()); assertEquals(View.GONE, mViews.dividerView.getVisibility()); } |