commit 83d09b68e139f830956b448a0b7ad395de7d2f2a
author Walter Jang <wjang@google.com> Tue Feb 24 12:37:42 2015 -0800
committer Walter Jang <wjang@google.com> Tue Feb 24 12:37:42 2015 -0800
tree 83a9bf0b1697c34bf63a282fd2ed2cd5b372d415
parent 0e72ce9d97e0133a5f7cc348eef363bef9395979

Use default primary color when creating new contacts

Missed this case in ag/639263

Bug 19124091

Change-Id: I33ea9a5d21d65f23fa3c5b5e5405edf92714a00d

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

diff --git a/src/com/android/contacts/editor/CompactHeaderView.java b/src/com/android/contacts/editor/CompactHeaderView.java
index bf26866..caac07a 100644
--- a/src/com/android/contacts/editor/CompactHeaderView.java
+++ b/src/com/android/contacts/editor/CompactHeaderView.java
@@ -128,8 +128,12 @@
             }
         }
 
-        if (!mIsPhotoSet && mMaterialPalette != null) {
-            mPhotoImageView.setTint(materialPalette.mPrimaryColor);
+        if (!mIsPhotoSet) {
+            final int color = materialPalette == null
+                    ? MaterialColorMapUtils.getDefaultPrimaryAndSecondaryColors(
+                            getResources()).mPrimaryColor
+                    : materialPalette.mPrimaryColor;
+            mPhotoImageView.setTint(color);
         }
 
         // Make the photo a square