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

Commit cfe1edfc authored by Tingting Wang's avatar Tingting Wang Committed by Android Git Automerger
Browse files

am 01b37680: Don\'t display "CUSTOM" when PHONE_TYPE == "CUSTOM" and no label set.

* commit '01b37680':
  Don't display "CUSTOM" when PHONE_TYPE == "CUSTOM" and no label set.
parents e58d1f78 01b37680
Loading
Loading
Loading
Loading
+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(" ");
                    }
                }