summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-10-28 07:24:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-28 07:24:24 +0000
commitd44e53e983f6cc9eb0aaa3a4f50d1dd19a6b3bfe (patch)
tree0c7ffaed658b5c62baf0af73976c67102b4e13d2
parent28dd0c16d66d3c045e2aea21597cce020ba6717e (diff)
parenteab736d94edbdbee8332e82406edcea59f14630a (diff)
am eab736d9: am c56648ed: am 2f44b3c9: Merge "Send desired size of photo to ContactPhotoManager" into lmp-mr1-dev
* commit 'eab736d94edbdbee8332e82406edcea59f14630a': Send desired size of photo to ContactPhotoManager
-rw-r--r--src/com/android/dialer/calllog/CallLogAdapter.java4
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);
}