Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40b026f4 authored by Gary Mai's avatar Gary Mai
Browse files

resolve merge conflicts of 9fa8987d to master 

Change-Id: I41e488cb0a1472233ccf9e6c26095f26920671ca
parents 0ad2905b 9fa8987d

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

+4 −1
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ import com.android.contacts.common.model.account.AccountDisplayInfo; 
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.CustomDataItem;

import com.android.contacts.common.model.dataitem.DataKind;

import com.android.contacts.common.util.AccountsListAdapter;
@@ -168,7 +170,8 @@ public class CompactRawContactsEditorView extends LinearLayout implements View.O 


            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