Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6af176fa authored by Flavio Lerda's avatar Flavio Lerda
Browse files

Remove unheard icon next to voicemail. 

Since unheard voicemails are anyway in the top "New" section, there is no
need to have the extra icon.

Moreover, this means we do not have two similar looking icons next to
each other, which make the iconography harder to understand: one meant
"unheard message", the other meant "press to play".

Bug: 5254001
Change-Id: Ie0e40a87435442a0f829c544d83ad24bd6fb7f17
parent dd18a805

src/com/android/contacts/calllog/CallLogListItemHelper.java

+0 −3
Original line number Diff line number Diff line
@@ -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);

        }

    }

src/com/android/contacts/calllog/CallLogListItemViews.java

+1 −6
Original line number Diff line number Diff line
@@ -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),

tests/src/com/android/contacts/calllog/CallLogListItemHelperTest.java

+0 −6
Original line number Diff line number Diff line
@@ -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());

    }