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

Commit fecad2c2 authored by Ricky Wai's avatar Ricky Wai Committed by Android (Google) Code Review
Browse files

Merge "Fix briefcase icon not displayed against Work contacts" into nyc-dev

parents 3d931ec1 8db2d6c9

src/com/android/contacts/common/list/ContactEntryListAdapter.java

+9 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.widget.TextView; 


import com.android.contacts.common.ContactPhotoManager;

import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;

import com.android.contacts.common.ContactsUtils;

import com.android.contacts.common.R;

import com.android.contacts.common.compat.CompatUtils;

import com.android.contacts.common.compat.DirectoryCompat;
@@ -130,6 +131,7 @@ public abstract class ContactEntryListAdapter extends IndexerListAdapter { 
    protected void bindView(View itemView, int partition, Cursor cursor, int position) {

        final ContactListItemView view = (ContactListItemView) itemView;

        view.setIsSectionHeaderEnabled(isSectionHeaderDisplayEnabled());

        bindWorkProfileIcon(view, partition);

    }



    @Override
@@ -618,6 +620,13 @@ public abstract class ContactEntryListAdapter extends IndexerListAdapter { 
        return view;

    }



    protected void bindWorkProfileIcon(final ContactListItemView view, int partition) {

        final DirectoryPartition directory = (DirectoryPartition) getPartition(partition);

        final long directoryId = directory.getDirectoryId();

        final long userType = ContactsUtils.determineUserType(directoryId, null);

        view.setWorkProfileIconEnabled(userType == ContactsUtils.USER_TYPE_WORK);

    }



    @Override

    protected void bindHeaderView(View view, int partitionIndex, Cursor cursor) {

        Partition partition = getPartition(partitionIndex);

src/com/android/contacts/common/list/PhoneNumberListAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -436,7 +436,6 @@ public class PhoneNumberListAdapter extends ContactEntryListAdapter { 


            view.removePhotoView(true, false);

        }

        bindWorkProfileIcon(view, partition);



        final DirectoryPartition directory = (DirectoryPartition) getPartition(partition);

        bindPhoneNumber(view, cursor, directory.isDisplayNumber(), position);
@@ -495,7 +494,8 @@ public class PhoneNumberListAdapter extends ContactEntryListAdapter { 
        view.hideDisplayName();

    }



    private void bindWorkProfileIcon(final ContactListItemView view, int partition) {

    @Override

    protected void bindWorkProfileIcon(final ContactListItemView view, int partition) {

        final DirectoryPartition directory = (DirectoryPartition) getPartition(partition);

        final long directoryId = directory.getDirectoryId();

        final long userType = ContactsUtils.determineUserType(directoryId, null);