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

Commit 2eb24bba authored Oct 20, 2017 by android-build-team Robot

Snap for 4407698 from 07001c0e to pi-release

Change-Id: I2b4dac2d425b133e53c222f04b794c91333fa348

parents d6119f2c 07001c0e

src/com/android/contacts/list/ContactListItemView.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -588,7 +588,8 @@ public class ContactListItemView extends ViewGroup
		// Calculate height including padding.
		int height = (mNameTextViewHeight + mPhoneticNameTextViewHeight +
		mLabelAndDataViewMaxHeight +
		mSnippetTextViewHeight + mStatusTextViewHeight);
		mSnippetTextViewHeight + mStatusTextViewHeight
		+ getPaddingBottom() + getPaddingTop());

		// Make sure the height is at least as high as the photo
		height = Math.max(height, mPhotoViewHeight + getPaddingBottom() + getPaddingTop());

src/com/android/contacts/quickcontact/QuickContactActivity.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1170,6 +1170,8 @@ public class QuickContactActivity extends ContactsActivity {
		final List<DataItem> sipCallDataItems = dataItemsMap.get(SipAddress.CONTENT_ITEM_TYPE);
		if (phoneDataItems != null && phoneDataItems.size() == 1) {
		mOnlyOnePhoneNumber = true;
		} else {
		mOnlyOnePhoneNumber = false;
		}
		String[] phoneNumbers = null;
		if (phoneDataItems != null) {
		@@ -1208,6 +1210,8 @@ public class QuickContactActivity extends ContactsActivity {
		final List<DataItem> emailDataItems = dataItemsMap.get(Email.CONTENT_ITEM_TYPE);
		if (emailDataItems != null && emailDataItems.size() == 1) {
		mOnlyOneEmail = true;
		} else {
		mOnlyOneEmail = false;
		}
		String[] emailAddresses = null;
		if (emailDataItems != null) {