commit 2e825c4cb78a017a2c313a63d361bab1a4be38b6
author Tingting Wang <tingtingw@google.com> Wed Jul 08 20:08:10 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 08 20:08:12 2015 +0000
tree 2a7c43e470b9a1d7313b515afbcb46865b9dd031
parent 23a34d10b03e8a713a2b93980ff7f4c696aff93d
parent 3df785b0ad0c0292adfc03a4f804d1b38053de63

Merge "Don't display Custom for PHONE_TYPE=CUSTOM part 2." into mnc-dev

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

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index d97d472..7a23632 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -1476,7 +1476,9 @@
                 if (phone.hasKindTypeColumn(kind)) {
                     text = Phone.getTypeLabel(res, phone.getKindTypeColumn(kind),
                             phone.getLabel()).toString();
-                    primaryContentDescription.append(text).append(" ");
+                    if (!TextUtils.isEmpty(text)) {
+                        primaryContentDescription.append(text).append(" ");
+                    }
                 }
                 primaryContentDescription.append(header);
                 icon = res.getDrawable(R.drawable.ic_phone_24dp);