Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't load photo if it's id is 0. Saves one database query Bug:2546767" into froyo

Browse Source
This commit is contained in:
Daniel Lehmann
2010-03-30 16:58:38 -07:00
committed by Android (Google) Code Review
parent 3ac51b3d6f 18d4b733f8
commit 58c9a4bca0
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/com/android/internal/widget/ContactHeaderWidget.java
View File

@@ -269,9 +269,19 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
bindContactInfo(cursor); bindContactInfo(cursor);
Uri lookupUri = Contacts.getLookupUri(cursor.getLong(ContactQuery._ID), Uri lookupUri = Contacts.getLookupUri(cursor.getLong(ContactQuery._ID),
cursor.getString(ContactQuery.LOOKUP_KEY)); cursor.getString(ContactQuery.LOOKUP_KEY));
startPhotoQuery(cursor.getLong(ContactQuery.PHOTO_ID),
lookupUri, false /* don't reset query handler */); final long photoId = cursor.getLong(ContactQuery.PHOTO_ID);
invalidate();
if (photoId == 0) {
mPhotoView.setImageBitmap(loadPlaceholderPhoto(null));
if (cookie != null && cookie instanceof Uri) {
mPhotoView.assignContactUri((Uri) cookie);
}
invalidate();
} else {
startPhotoQuery(photoId, lookupUri,
false /* don't reset query handler */);
}
} else { } else {
// shouldn't really happen // shouldn't really happen
setDisplayName(null, null); setDisplayName(null, null);