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

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

Browse Source 
Merge commit '58c9a4bca0ce20ebf63a8c9619d405b788a98b9b' into froyo-plus-aosp

* commit '58c9a4bca0ce20ebf63a8c9619d405b788a98b9b':
  Don't load photo if it's id is 0. Saves one database query
This commit is contained in:
Daniel Lehmann
2010-03-30 17:01:45 -07:00
committed by Android Git Automerger
parent 9ebc9f464f 58c9a4bca0
commit 1b679754b6
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);
Uri lookupUri = Contacts.getLookupUri(cursor.getLong(ContactQuery._ID),
cursor.getString(ContactQuery.LOOKUP_KEY));
startPhotoQuery(cursor.getLong(ContactQuery.PHOTO_ID),
lookupUri, false /* don't reset query handler */);
invalidate();
final long photoId = cursor.getLong(ContactQuery.PHOTO_ID);
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 {
// shouldn't really happen
setDisplayName(null, null);