diff options
author | Yorke Lee <yorkelee@google.com> | 2014-10-27 20:35:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-27 20:35:48 +0000 |
commit | c56648edf1c24d2ea8ea70d13e4ec42a365e5468 (patch) | |
tree | 009b816d74c04bcd45eb87174aa9c83e3b476403 | |
parent | cce9227231d1b756da7169e1ee864a2fec01937d (diff) | |
parent | 2f44b3c979f292211982608869af3c07cba06620 (diff) |
am 2f44b3c9: Merge "Send desired size of photo to ContactPhotoManager" into lmp-mr1-dev
* commit '2f44b3c979f292211982608869af3c07cba06620':
Send desired size of photo to ContactPhotoManager
-rw-r--r-- | src/com/android/dialer/calllog/CallLogAdapter.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index 6afade407..50520bb42 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -267,6 +267,7 @@ public class CallLogAdapter extends GroupingListAdapter private int mCallLogBackgroundColor; private int mExpandedBackgroundColor; private float mExpandedTranslationZ; + private int mPhotoSize; /** Listener for the primary or secondary actions in the list. * Primary opens the call details. @@ -365,6 +366,7 @@ public class CallLogAdapter extends GroupingListAdapter mCallLogBackgroundColor = resources.getColor(R.color.background_dialer_list_items); mExpandedBackgroundColor = resources.getColor(R.color.call_log_expanded_background_color); mExpandedTranslationZ = resources.getDimension(R.dimen.call_log_expanded_translation_z); + mPhotoSize = resources.getDimensionPixelSize(R.dimen.contact_photo_size); mContactPhotoManager = ContactPhotoManager.getInstance(mContext); mPhoneNumberHelper = new PhoneNumberDisplayHelper(mContext, resources); @@ -1233,7 +1235,7 @@ public class CallLogAdapter extends GroupingListAdapter views.quickContactView.setOverlay(null); DefaultImageRequest request = new DefaultImageRequest(displayName, identifier, contactType, true /* isCircular */); - mContactPhotoManager.loadDirectoryPhoto(views.quickContactView, photoUri, + mContactPhotoManager.loadPhoto(views.quickContactView, photoUri, mPhotoSize, false /* darkTheme */, true /* isCircular */, request); } |