Merge "Remove layout transition from photo view in editor" into ub-contactsdialer-g-dev (5ab17a20) · Commits · e / os / android_packages_apps_Contacts

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

+15 −21

Original line number	Original line	Diff line number	Diff line
	@@ -16,22 +16,6 @@

	package com.android.contacts.editor;		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.ContentUris;
	import android.content.Context;		import android.content.Context;
	import android.database.Cursor;		import android.database.Cursor;
	@@ -69,6 +53,21 @@ import android.widget.LinearLayout;
	import android.widget.ListPopupWindow;		import android.widget.ListPopupWindow;
	import android.widget.TextView;		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.io.FileNotFoundException;
	import java.util.ArrayList;		import java.util.ArrayList;
	import java.util.Arrays;		import java.util.Arrays;
	@@ -617,11 +616,6 @@ public class CompactRawContactsEditorView extends LinearLayout implements View.O
	MaterialColorMapUtils.MaterialPalette materialPalette, ViewIdGenerator viewIdGenerator,		MaterialColorMapUtils.MaterialPalette materialPalette, ViewIdGenerator viewIdGenerator,
	long photoId, boolean hasNewContact, boolean isUserProfile,		long photoId, boolean hasNewContact, boolean isUserProfile,
	AccountWithDataSet primaryAccount) {		AccountWithDataSet primaryAccount) {
	// 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());
	}
	mKindSectionDataMap.clear();		mKindSectionDataMap.clear();
	mKindSectionViewsMap.clear();		mKindSectionViewsMap.clear();
	mKindSectionViews.removeAllViews();		mKindSectionViews.removeAllViews();