commit a167fd33343c2f65d632dfacf4331dd935438f77
author Gary Mai <garymai@google.com> Mon Sep 19 23:26:56 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 19 23:26:56 2016 +0000
tree ec3c775255eca595f7d0c43c8660a8bad9f07444
parent cf72b35d25a8332ac28b762460ad4d671d32b37a
parent 9fa8987d511857fafddadc082982aef6816c2b4f

Merge "Don't render account name for device and sim" into ub-contactsdialer-g-dev

src/com/android/contacts/editor/CompactRawContactsEditorView.java

diff --git a/src/com/android/contacts/editor/CompactRawContactsEditorView.java b/src/com/android/contacts/editor/CompactRawContactsEditorView.java
index 5c3c565..f43d974 100644
--- a/src/com/android/contacts/editor/CompactRawContactsEditorView.java
+++ b/src/com/android/contacts/editor/CompactRawContactsEditorView.java
@@ -63,6 +63,8 @@
 import com.android.contacts.common.model.account.AccountDisplayInfoFactory;
 import com.android.contacts.common.model.account.AccountType;
 import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.common.model.account.DeviceLocalAccountType;
+import com.android.contacts.common.model.account.SimAccountType;
 import com.android.contacts.common.model.dataitem.DataKind;
 import com.android.contacts.common.util.AccountsListAdapter;
 import com.android.contacts.common.util.MaterialColorMapUtils;
@@ -165,7 +167,8 @@
 
             final TextView text2 = (TextView) resultView.findViewById(android.R.id.text2);
             final String accountName = rawContactDelta.getAccountName();
-            if (TextUtils.isEmpty(accountName)) {
+            if (TextUtils.isEmpty(accountName) || accountType instanceof DeviceLocalAccountType
+                    || accountType instanceof SimAccountType) {
                 text2.setVisibility(View.GONE);
             } else {
                 // Truncate email addresses in the middle so we don't lose the domain