commit 1573aa697284e6627c7bb74eae4c350f56780c33
author Walter Jang <wjang@google.com> Thu Mar 12 13:54:56 2015 -0700
committer Walter Jang <wjang@google.com> Thu Mar 12 14:56:13 2015 -0700
tree 2318bfd7cecb8ab7d03ed7bdfeed302bac540645
parent 055c66d459732973f7341331b143d7ab9974c4ed

Re-apply tint after removing photo from compact contact editor

Change-Id: I288f5ce77c0061bb7cde38edbdfb9ac6462b3b15

src/com/android/contacts/editor/CompactPhotoEditorView.java

diff --git a/src/com/android/contacts/editor/CompactPhotoEditorView.java b/src/com/android/contacts/editor/CompactPhotoEditorView.java
index c4ece0d..ef05651 100644
--- a/src/com/android/contacts/editor/CompactPhotoEditorView.java
+++ b/src/com/android/contacts/editor/CompactPhotoEditorView.java
@@ -25,6 +25,7 @@
 import com.android.contacts.common.model.ValuesDelta;
 import com.android.contacts.common.model.dataitem.DataKind;
 import com.android.contacts.common.util.MaterialColorMapUtils;
+import com.android.contacts.common.util.MaterialColorMapUtils.MaterialPalette;
 import com.android.contacts.editor.CompactContactEditorFragment.PhotoHandler;
 import com.android.contacts.util.ContactPhotoUtils;
 import com.android.contacts.util.SchedulingUtils;
@@ -61,6 +62,7 @@
     private ValuesDelta mValuesDelta;
     private boolean mReadOnly;
     private boolean mIsPhotoSet;
+    private MaterialPalette mMaterialPalette;
 
     private QuickContactImageView mPhotoImageView;
 
@@ -88,11 +90,11 @@
     }
 
     public void setValues(DataKind dataKind, ValuesDelta valuesDelta,
-            RawContactDelta rawContactDelta, boolean readOnly,
-            MaterialColorMapUtils.MaterialPalette materialPalette,
+            RawContactDelta rawContactDelta, boolean readOnly, MaterialPalette materialPalette,
             ViewIdGenerator viewIdGenerator) {
         mValuesDelta = valuesDelta;
         mReadOnly = readOnly;
+        mMaterialPalette = materialPalette;
 
         setId(viewIdGenerator.getId(rawContactDelta, dataKind, valuesDelta, /* viewIndex =*/ 0));
 
@@ -127,11 +129,7 @@
         }
 
         if (!mIsPhotoSet) {
-            final int color = materialPalette == null
-                    ? MaterialColorMapUtils.getDefaultPrimaryAndSecondaryColors(
-                            getResources()).mPrimaryColor
-                    : materialPalette.mPrimaryColor;
-            mPhotoImageView.setTint(color);
+            setDefaultPhotoTint();
         }
 
         // Adjust the photo dimensions following the same logic as in
@@ -216,10 +214,19 @@
     private void setDefaultPhoto() {
         mPhotoImageView.setImageDrawable(ContactPhotoManager.getDefaultAvatarDrawableForContact(
                 getResources(), /* hires =*/ false, /* defaultImageRequest =*/ null));
+        setDefaultPhotoTint();
         mIsPhotoSet = false;
         mValuesDelta.setFromTemplate(true);
     }
 
+    private void setDefaultPhotoTint() {
+        final int color = mMaterialPalette == null
+                ? MaterialColorMapUtils.getDefaultPrimaryAndSecondaryColors(
+                getResources()).mPrimaryColor
+                : mMaterialPalette.mPrimaryColor;
+        mPhotoImageView.setTint(color);
+    }
+
     /**
      * Bind the photo at the given Uri to the UI but do not set the photo on the underlying
      * {@link ValuesDelta}.