New letter tile palette. b/16219169

Change-Id: If0ec83382974aa5e1b34fcba2187b03c7b31371d

1 files changed, 3 insertions, 4 deletions

diff --git a/src/com/android/mail/photomanager/LetterTileProvider.java b/src/com/android/mail/photomanager/LetterTileProvider.java
index 9f922e055..bf17acbac 100644
--- a/src/com/android/mail/photomanager/LetterTileProvider.java
+++ b/src/com/android/mail/photomanager/LetterTileProvider.java
@@ -55,6 +55,7 @@ public class LetterTileProvider {
     private final int mTileFontColor;
     private final TextPaint mPaint = new TextPaint();
     private final TypedArray mColors;
+    private final int mColorCount;
     private final int mDefaultColor;
     private final Canvas mCanvas = new Canvas();
     private final Dimensions mDims = new Dimensions();
@@ -62,9 +63,6 @@ public class LetterTileProvider {
 
     private static final int POSSIBLE_BITMAP_SIZES = 3;
 
-    // This should match the total number of colors defined in colors.xml for letter_tile_color
-    private static final int NUM_OF_TILE_COLORS = 12;
-
     public LetterTileProvider(Context context) {
         final Resources res = context.getResources();
         mTileLetterFontSize = res.getDimensionPixelSize(R.dimen.tile_letter_font_size);
@@ -83,6 +81,7 @@ public class LetterTileProvider {
         mDefaultBitmapCache = new Bitmap[POSSIBLE_BITMAP_SIZES];
 
         mColors = res.obtainTypedArray(R.array.letter_tile_colors);
+        mColorCount = mColors.length();
         mDefaultColor = res.getColor(R.color.letter_tile_default_color);
     }
 
@@ -168,7 +167,7 @@ public class LetterTileProvider {
     private int pickColor(String emailAddress) {
         // String.hashCode() implementation is not supposed to change across java versions, so
         // this should guarantee the same email address always maps to the same color.
-        int color = Math.abs(emailAddress.hashCode()) % NUM_OF_TILE_COLORS;
+        int color = Math.abs(emailAddress.hashCode()) % mColorCount;
         return mColors.getColor(color, mDefaultColor);
     }
 }