commit db108c7ee7199b99fc6f15af58979aa5a0747e75
author Yorke Lee <yorkelee@google.com> Mon May 19 18:21:59 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 19 18:21:59 2014 +0000
tree 8edeeeccecc2a0920a265c0eda81bd5df1717e6e
parent 2be1220c2866a0538c848c2b8cb5b6007caa2efe
parent 8269bb1b65493ddbf6c2585546ae59cf7152aaa2

Merge "Set isCircular flag correctly in CallDetailActivity"

src/com/android/contacts/common/ContactPhotoManager.java

diff --git a/src/com/android/contacts/common/ContactPhotoManager.java b/src/com/android/contacts/common/ContactPhotoManager.java
index d915fad..f9db2ed 100644
--- a/src/com/android/contacts/common/ContactPhotoManager.java
+++ b/src/com/android/contacts/common/ContactPhotoManager.java
@@ -807,7 +807,7 @@
             if (DEBUG) Log.d(TAG, "loadPhoto request: " + photoUri);
             if (isDefaultImageUri(photoUri)) {
                 createAndApplyDefaultImageForUri(view, photoUri, requestedExtent, darkTheme,
-                        defaultProvider);
+                        isCircular, defaultProvider);
             } else {
                 loadPhotoByIdOrUri(view, Request.createFromUri(photoUri, requestedExtent,
                         darkTheme, isCircular, defaultProvider));
@@ -816,8 +816,9 @@
     }
 
     private void createAndApplyDefaultImageForUri(ImageView view, Uri uri, int requestedExtent,
-            boolean darkTheme, DefaultImageProvider defaultProvider) {
+            boolean darkTheme, boolean isCircular, DefaultImageProvider defaultProvider) {
         DefaultImageRequest request = getDefaultImageRequestFromUri(uri);
+        request.isCircular = isCircular;
         defaultProvider.applyDefaultImage(view, requestedExtent, darkTheme, request);
     }