Merge change 25847 into eclair
* changes: Fix http://b/issue?id=2099487
This commit is contained in:
@@ -248,7 +248,9 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
|
|||||||
PHONE_LOOKUP_CONTACT_LOOKUP_KEY_COLUMN_INDEX);
|
PHONE_LOOKUP_CONTACT_LOOKUP_KEY_COLUMN_INDEX);
|
||||||
bindFromContactUri(Contacts.getLookupUri(contactId, lookupKey));
|
bindFromContactUri(Contacts.getLookupUri(contactId, lookupKey));
|
||||||
} else {
|
} else {
|
||||||
setDisplayName((String) cookie, null);
|
String phoneNumber = (String) cookie;
|
||||||
|
setDisplayName(phoneNumber, null);
|
||||||
|
mPhotoView.assignContactFromPhone(phoneNumber, true);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -259,7 +261,9 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
|
|||||||
EMAIL_LOOKUP_CONTACT_LOOKUP_KEY_COLUMN_INDEX);
|
EMAIL_LOOKUP_CONTACT_LOOKUP_KEY_COLUMN_INDEX);
|
||||||
bindFromContactUri(Contacts.getLookupUri(contactId, lookupKey));
|
bindFromContactUri(Contacts.getLookupUri(contactId, lookupKey));
|
||||||
} else {
|
} else {
|
||||||
setDisplayName((String) cookie, null);
|
String emailAddress = (String) cookie;
|
||||||
|
setDisplayName(emailAddress, null);
|
||||||
|
mPhotoView.assignContactFromEmail(emailAddress, true);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user