Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f44b3c9 authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

Merge "Send desired size of photo to ContactPhotoManager" into lmp-mr1-dev

parents c502ad99 141bdce7

src/com/android/dialer/calllog/CallLogAdapter.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -267,6 +267,7 @@ public class CallLogAdapter extends GroupingListAdapter 
    private int mCallLogBackgroundColor;

    private int mCallLogBackgroundColor;

    private int mExpandedBackgroundColor;

    private int mExpandedBackgroundColor;

    private float mExpandedTranslationZ;

    private float mExpandedTranslationZ;

    private int mPhotoSize;





    /** Listener for the primary or secondary actions in the list.

    /** Listener for the primary or secondary actions in the list.

     *  Primary opens the call details.

     *  Primary opens the call details.
@@ -365,6 +366,7 @@ public class CallLogAdapter extends GroupingListAdapter 
        mCallLogBackgroundColor = resources.getColor(R.color.background_dialer_list_items);

        mCallLogBackgroundColor = resources.getColor(R.color.background_dialer_list_items);

        mExpandedBackgroundColor = resources.getColor(R.color.call_log_expanded_background_color);

        mExpandedBackgroundColor = resources.getColor(R.color.call_log_expanded_background_color);

        mExpandedTranslationZ = resources.getDimension(R.dimen.call_log_expanded_translation_z);

        mExpandedTranslationZ = resources.getDimension(R.dimen.call_log_expanded_translation_z);

        mPhotoSize = resources.getDimensionPixelSize(R.dimen.contact_photo_size);





        mContactPhotoManager = ContactPhotoManager.getInstance(mContext);

        mContactPhotoManager = ContactPhotoManager.getInstance(mContext);

        mPhoneNumberHelper = new PhoneNumberDisplayHelper(mContext, resources);

        mPhoneNumberHelper = new PhoneNumberDisplayHelper(mContext, resources);
@@ -1233,7 +1235,7 @@ public class CallLogAdapter extends GroupingListAdapter 
        views.quickContactView.setOverlay(null);

        views.quickContactView.setOverlay(null);

        DefaultImageRequest request = new DefaultImageRequest(displayName, identifier,

        DefaultImageRequest request = new DefaultImageRequest(displayName, identifier,

                contactType, true /* isCircular */);

                contactType, true /* isCircular */);

        mContactPhotoManager.loadDirectoryPhoto(views.quickContactView, photoUri,

        mContactPhotoManager.loadPhoto(views.quickContactView, photoUri, mPhotoSize,

                false /* darkTheme */, true /* isCircular */, request);

                false /* darkTheme */, true /* isCircular */, request);

    }

    }