commit a3859ed9ff9f315d492e199620a08ae35ab8569f
author Brian Attwell <brianattwell@google.com> Tue Jul 15 13:51:55 2014 -0700
committer Brian Attwell <brianattwell@google.com> Tue Jul 15 14:19:33 2014 -0700
tree 01d2a171fca0164b47eb54a9531f905fef2b661a
parent aed3d5a4ab674917fe2c1264ce3bdc1debe345e2

Use changed MaterialColorMapUtils

BUG: 16159407
Change-Id: I216248b432fe9557111c4c4f68e612bb3a84266d

src/com/android/contacts/quickcontact/QuickContactActivity.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 43b062f..1f01c24 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -207,6 +207,7 @@
     private AsyncTask<Void, Void, Pair<List<List<DataItem>>, Map<String, List<DataItem>>>>
             mEntriesAndActionsTask;
     private ColorDrawable mWindowScrim;
+    private MaterialColorMapUtils mMaterialColorMapUtils;
     private boolean mIsWaitingForOtherPieceOfExitAnimation;
     private boolean mIsExitAnimationInProgress;
     private boolean mHasComputedThemeColor;
@@ -491,6 +492,8 @@
 
         setContentView(R.layout.quickcontact_activity);
 
+        mMaterialColorMapUtils = new MaterialColorMapUtils(getResources());
+
         mContactCard = (ExpandingEntryCardView) findViewById(R.id.communication_card);
         mNoContactDetailsCard = (ExpandingEntryCardView) findViewById(R.id.no_contact_data_card);
         mRecentCard = (ExpandingEntryCardView) findViewById(R.id.recent_card);
@@ -567,7 +570,8 @@
                             // header tint before the MultiShrinkScroller has been measured will
                             // cause incorrect tinting calculations.
                             if (color != 0) {
-                                setThemeColor(MaterialColorMapUtils.calculateSecondaryColor(color));
+                                setThemeColor(mMaterialColorMapUtils
+                                        .calculatePrimaryAndSecondaryColor(color));
                             }
                         }
                     });
@@ -1226,16 +1230,15 @@
                     final Bitmap bitmap = ((BitmapDrawable) imageViewDrawable).getBitmap();
                     final int primaryColor = colorFromBitmap(bitmap);
                     if (primaryColor != 0) {
-                        return MaterialColorMapUtils.calculatePrimaryAndSecondaryColor(
+                        return mMaterialColorMapUtils.calculatePrimaryAndSecondaryColor(
                                 primaryColor);
                     }
                 }
                 if (imageViewDrawable instanceof LetterTileDrawable) {
                     final int primaryColor = ((LetterTileDrawable) imageViewDrawable).getColor();
-                    return MaterialColorMapUtils.calculateSecondaryColor(primaryColor);
+                    return mMaterialColorMapUtils.calculatePrimaryAndSecondaryColor(primaryColor);
                 }
-                return MaterialColorMapUtils.calculatePrimaryAndSecondaryColor(
-                        getResources().getColor(R.color.quickcontact_default_photo_tint_color));
+                return MaterialColorMapUtils.getDefaultPrimaryAndSecondaryColors(getResources());
             }
 
             @Override