commit cae10ce4219962008a22482cd17001d5621279ab
author Dave Santoro <dsantoro@google.com> Mon May 16 17:29:44 2011 -0700
committer Dave Santoro <dsantoro@google.com> Mon May 16 17:31:04 2011 -0700
tree 539c9f810d8e4a6977435cdec8ecb684a91bddfa
parent 20e4f239151a9b118e729ad820ff3a691816e9a1

Fix header display without display name.

Change-Id: Iaec6831158b640c34e585fc68e6945f7ec1cfb3c

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

diff --git a/src/com/android/contacts/detail/ContactDetailHeaderView.java b/src/com/android/contacts/detail/ContactDetailHeaderView.java
index b88b43e..795ed62 100644
--- a/src/com/android/contacts/detail/ContactDetailHeaderView.java
+++ b/src/com/android/contacts/detail/ContactDetailHeaderView.java
@@ -200,26 +200,28 @@
         // Check the preference for display name ordering, and bold the contact's first name if
         // possible.
         ContactsPreferences prefs = new ContactsPreferences(getContext());
-        CharSequence styledName;
-        if (prefs.getDisplayOrder() == ContactsContract.Preferences.DISPLAY_ORDER_PRIMARY) {
-            int overlapPoint = FormatUtils.overlapPoint(
-                    displayName.toString(), altDisplayName.toString());
-            if (overlapPoint > 0) {
-                styledName = FormatUtils.applyStyleToSpan(Typeface.BOLD,
-                        displayName, 0, overlapPoint, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        CharSequence styledName = "";
+        if (!TextUtils.isEmpty(displayName) && !TextUtils.isEmpty(altDisplayName)) {
+            if (prefs.getDisplayOrder() == ContactsContract.Preferences.DISPLAY_ORDER_PRIMARY) {
+                int overlapPoint = FormatUtils.overlapPoint(
+                        displayName.toString(), altDisplayName.toString());
+                if (overlapPoint > 0) {
+                    styledName = FormatUtils.applyStyleToSpan(Typeface.BOLD,
+                            displayName, 0, overlapPoint, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                } else {
+                    styledName = displayName;
+                }
             } else {
-                styledName = displayName;
-            }
-        } else {
-            // Displaying alternate display name.
-            int overlapPoint = FormatUtils.overlapPoint(
-                    altDisplayName.toString(), displayName.toString());
-            if (overlapPoint > 0) {
-                styledName = FormatUtils.applyStyleToSpan(Typeface.BOLD,
-                        altDisplayName, overlapPoint, altDisplayName.length(),
-                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-            } else {
-                styledName = altDisplayName;
+                // Displaying alternate display name.
+                int overlapPoint = FormatUtils.overlapPoint(
+                        altDisplayName.toString(), displayName.toString());
+                if (overlapPoint > 0) {
+                    styledName = FormatUtils.applyStyleToSpan(Typeface.BOLD,
+                            altDisplayName, overlapPoint, altDisplayName.length(),
+                            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                } else {
+                    styledName = altDisplayName;
+                }
             }
         }
         mDisplayNameView.setText(styledName);