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

Commit 410eee31 authored by Gary Mai's avatar Gary Mai
Browse files

resolve merge conflicts of b6e28d2d to master 

Change-Id: Ic8adea7525406a376b598954f33ee2642ccb1b88
parents cc3e9a58 b6e28d2d

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

+15 −21
Original line number Diff line number Diff line
@@ -16,22 +16,6 @@ 


package com.android.contacts.editor;



import com.android.contacts.common.model.account.AccountDisplayInfo;

import com.android.contacts.common.model.account.AccountDisplayInfoFactory;

import com.android.contacts.R;

import com.android.contacts.common.model.AccountTypeManager;

import com.android.contacts.common.model.RawContactDelta;

import com.android.contacts.common.model.RawContactDeltaList;

import com.android.contacts.common.model.RawContactModifier;

import com.android.contacts.common.model.ValuesDelta;

import com.android.contacts.common.model.account.AccountType;

import com.android.contacts.common.model.account.AccountWithDataSet;

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

import com.android.contacts.common.util.AccountsListAdapter;

import com.android.contacts.common.util.MaterialColorMapUtils;

import com.android.contacts.util.UiClosables;



import android.animation.LayoutTransition;

import android.content.ContentUris;

import android.content.Context;

import android.database.Cursor;
@@ -69,6 +53,21 @@ import android.widget.LinearLayout; 
import android.widget.ListPopupWindow;

import android.widget.TextView;



import com.android.contacts.R;

import com.android.contacts.common.model.AccountTypeManager;

import com.android.contacts.common.model.RawContactDelta;

import com.android.contacts.common.model.RawContactDeltaList;

import com.android.contacts.common.model.RawContactModifier;

import com.android.contacts.common.model.ValuesDelta;

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.dataitem.DataKind;

import com.android.contacts.common.util.AccountsListAdapter;

import com.android.contacts.common.util.MaterialColorMapUtils;

import com.android.contacts.util.UiClosables;



import java.io.FileNotFoundException;

import java.util.ArrayList;

import java.util.Arrays;
@@ -623,11 +622,6 @@ public class CompactRawContactsEditorView extends LinearLayout implements View.O 
            AccountWithDataSet primaryAccount, long rawContactIdToDisplayAlone,

            boolean rawContactDisplayAloneIsReadOnly,

            boolean isEditingReadOnlyRawContactWithNewContact) {

        // Enable layout animations for new contacts. This looks nicer when switching to and from

        // an account that doesn't support profile photos (e.g. SIM accounts).

        if (hasNewContact && getLayoutTransition() == null) {

            setLayoutTransition(new LayoutTransition());

        }



        mRawContactDeltas = rawContactDeltas;

        mRawContactIdToDisplayAlone = rawContactIdToDisplayAlone;