Merge change 25847 into eclair (95ebd3bd) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/ContactHeaderWidget.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -248,7 +248,9 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
		PHONE_LOOKUP_CONTACT_LOOKUP_KEY_COLUMN_INDEX);
		bindFromContactUri(Contacts.getLookupUri(contactId, lookupKey));
		} else {
		setDisplayName((String) cookie, null);
		String phoneNumber = (String) cookie;
		setDisplayName(phoneNumber, null);
		mPhotoView.assignContactFromPhone(phoneNumber, true);
		}
		break;
		}
		@@ -259,7 +261,9 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
		EMAIL_LOOKUP_CONTACT_LOOKUP_KEY_COLUMN_INDEX);
		bindFromContactUri(Contacts.getLookupUri(contactId, lookupKey));
		} else {
		setDisplayName((String) cookie, null);
		String emailAddress = (String) cookie;
		setDisplayName(emailAddress, null);
		mPhotoView.assignContactFromEmail(emailAddress, true);
		}
		break;
		}