commit da2f4deeca4843995bdcea726c54bda8582c908b
author Tingting Wang <tingtingw@google.com> Wed Jul 08 21:02:15 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 08 21:02:15 2015 +0000
tree 76337b38d81772103e3d0d6dc5bdc89f2ddf6446
parent 618a237e124a0c17d017ba595f41b90a2ac50b8d
parent aeb5842db5d9008f6a2bcd6e472b369dd37bcc04

am aeb5842d: am 64edadda: am 66e97032: am 2e825c4c: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 2." into mnc-dev

* commit 'aeb5842db5d9008f6a2bcd6e472b369dd37bcc04':
  Don't display Custom for PHONE_TYPE=CUSTOM part 2.

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);