Merge change 27234 into eclair

* changes:
  Fix http://b/issue?id=2106682 (Don't show status if we don't have it).
This commit is contained in:
Android (Google) Code Review
2009-09-26 17:49:12 -04:00

View File

@@ -456,8 +456,13 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
mPhotoView.assignContactUri(Contacts.getLookupUri(contactId, lookupKey));
//Set the presence status
int presence = c.getInt(HEADER_PRESENCE_STATUS_COLUMN_INDEX);
mPresenceView.setImageResource(Presence.getPresenceIconResourceId(presence));
if (!c.isNull(HEADER_PRESENCE_STATUS_COLUMN_INDEX)) {
int presence = c.getInt(HEADER_PRESENCE_STATUS_COLUMN_INDEX);
mPresenceView.setImageResource(Presence.getPresenceIconResourceId(presence));
mPresenceView.setVisibility(View.VISIBLE);
} else {
mPresenceView.setVisibility(View.GONE);
}
}
/**