commit 15a194aaec67bbe626f134a71b18eb0eaf539360
author Daniel Lehmann <lehmannd@google.com> Wed Mar 24 13:45:05 2010 -0700
committer Daniel Lehmann <lehmannd@google.com> Wed Mar 24 13:45:05 2010 -0700
tree d76ae515fa1f50a0b224a6e093c502ae6b08f223
parent 655236cbe9d660735713924cdcbbdf0038727f23

Promote Position to label (instead of data) if Company name is empty
Bug:2534607

Change-Id: I5e888d6896aa8ad56a56efd5526d90b8afb01278

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