commit 75f8fec84fd684d23d33157c48c6b84573b42629
author Daniel Lehmann <lehmannd@google.com> Wed Mar 24 14:29:23 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 24 14:29:23 2010 -0700
tree c02b7ffeced1b2421249e7e03cac0efa4a6a8406
parent 15a194aaec67bbe626f134a71b18eb0eaf539360
parent a1660502853084d670b36e93c4b4c05e3b2b7657

Merge "Change "Position" to "Title" in Ghost text Bug:2539245"

src/com/android/contacts/ViewContactActivity.java

diff --git a/src/com/android/contacts/ViewContactActivity.java b/src/com/android/contacts/ViewContactActivity.java
index cdf2871..2e41d80 100644
--- a/src/com/android/contacts/ViewContactActivity.java
+++ b/src/com/android/contacts/ViewContactActivity.java
@@ -939,10 +939,16 @@
                         final boolean duplicatesTitle =
                             isNameRawContact
                             && mDisplayNameSource == DisplayNameSources.ORGANIZATION
-                            && !hasData;
+                            && (!hasData || TextUtils.isEmpty(entry.label));
 
                         if (!duplicatesTitle) {
                             entry.uri = null;
+
+                            if (TextUtils.isEmpty(entry.label)) {
+                                entry.label = entry.data;
+                                entry.data = "";
+                            }
+
                             mOrganizationEntries.add(entry);
                         }
                     } else if (Nickname.CONTENT_ITEM_TYPE.equals(mimeType) && hasData) {