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

Commit 2e385832 authored by Yorke Lee's avatar Yorke Lee
Browse files

Don't show star icon in QC for uri-encoded contact 

Also don't show empty directory name/type in contact details card

Bug: 10600250
Change-Id: Ifa7cdd3f9f943f4beed3b9cb26f5bb3300577eea
parent c228b629

src/com/android/contacts/detail/ContactDetailDisplayUtils.java

+8 −3
Original line number Diff line number Diff line
@@ -129,9 +129,14 @@ public class ContactDetailDisplayUtils { 
        if (contactData.isDirectoryEntry()) {

            String directoryDisplayName = contactData.getDirectoryDisplayName();

            String directoryType = contactData.getDirectoryType();

            String displayName = !TextUtils.isEmpty(directoryDisplayName)

                    ? directoryDisplayName

                    : directoryType;

            final String displayName;

            if (!TextUtils.isEmpty(directoryDisplayName)) {

                displayName = directoryDisplayName;

            } else if (!TextUtils.isEmpty(directoryType)) {

                displayName = directoryType;

            } else {

                return null;

            }

            return context.getString(R.string.contact_directory_description, displayName);

        }

        return null;

src/com/android/contacts/quickcontact/QuickContactActivity.java

+27 −18
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ import com.android.contacts.common.model.dataitem.DataKind; 
import com.android.contacts.model.dataitem.EmailDataItem;

import com.android.contacts.model.dataitem.ImDataItem;

import com.android.contacts.common.util.Constants;

import com.android.contacts.common.util.UriUtils;

import com.android.contacts.util.DataStatus;

import com.android.contacts.util.ImageViewDrawableSetter;

import com.android.contacts.util.SchedulingUtils;
@@ -352,13 +353,20 @@ public class QuickContactActivity extends Activity { 
            mStarImage.setImageResource(R.drawable.ic_favorite_off_lt);

        }

        final Uri lookupUri = data.getLookupUri();



        // If this is a json encoded URI, there is no local contact to star

        if (UriUtils.isEncodedContactUri(lookupUri)) {

            mStarImage.setVisibility(View.GONE);

        } else {

            mStarImage.setVisibility(View.VISIBLE);

            mStarImage.setOnClickListener(new OnClickListener() {

                @Override

                public void onClick(View view) {

                    // Toggle "starred" state

                    // Make sure there is a contact

                    if (lookupUri != null) {

                    // Changes the state of the image already before sending updates to the database

                        // Changes the state of the image already before sending updates to the

                        // database

                        if (isStarred) {

                            mStarImage.setImageResource(R.drawable.ic_favorite_off_lt);

                        } else {
@@ -372,6 +380,7 @@ public class QuickContactActivity extends Activity { 
                    }

                }

            });

        }



        mDefaultsMap.clear();