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

Commit 01b37680 authored by Tingting Wang's avatar Tingting Wang
Browse files

Don't display "CUSTOM" when PHONE_TYPE == "CUSTOM" and no label set. 

Check the case which PHONE_TYPE="CUSTOM" and no label set in
QuickActivity, and return empty string instead of "CUSTOM".

BUG 21900262

Change-Id: Icde2d7ec68bb2b489875b99dc6c2166d939134ea
parent d3cf48da

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

+6 −3
Original line number Diff line number Diff line
@@ -1487,9 +1487,12 @@ public class QuickContactActivity extends ContactsActivity { 
                        res.getString(R.string.phoneLabelsGroup), dataItem.getMimeType(),

                        dataItem.getId(), dataItem.isSuperPrimary());

                if (phone.hasKindTypeColumn(kind)) {

                    text = Phone.getTypeLabel(res, phone.getKindTypeColumn(kind),

                            phone.getLabel()).toString();

                    if (!TextUtils.isEmpty(text)) {

                    final int kindTypeColumn = phone.getKindTypeColumn(kind);

                    final String label = phone.getLabel();

                    if (kindTypeColumn == Phone.TYPE_CUSTOM && TextUtils.isEmpty(label)) {

                        text = "";

                    } else {

                        text = Phone.getTypeLabel(res, kindTypeColumn, label).toString();

                        primaryContentDescription.append(text).append(" ");

                    }

                }