Merge "Updated anonymous avatar." into ub-gmail-ur14-dev
diff --git a/res/drawable-mdpi/ic_anonymous_avatar_48dp.png b/res/drawable-hdpi/ic_anonymous_avatar_40dp.png
similarity index 72%
copy from res/drawable-mdpi/ic_anonymous_avatar_48dp.png
copy to res/drawable-hdpi/ic_anonymous_avatar_40dp.png
index 6fde8d5..072f172 100644
--- a/res/drawable-mdpi/ic_anonymous_avatar_48dp.png
+++ b/res/drawable-hdpi/ic_anonymous_avatar_40dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_anonymous_avatar_48dp.png b/res/drawable-mdpi/ic_anonymous_avatar_40dp.png
similarity index 73%
rename from res/drawable-mdpi/ic_anonymous_avatar_48dp.png
rename to res/drawable-mdpi/ic_anonymous_avatar_40dp.png
index 6fde8d5..ac0bbe3 100644
--- a/res/drawable-mdpi/ic_anonymous_avatar_48dp.png
+++ b/res/drawable-mdpi/ic_anonymous_avatar_40dp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_anonymous_avatar_48dp.png b/res/drawable-xhdpi/ic_anonymous_avatar_40dp.png
similarity index 66%
rename from res/drawable-hdpi/ic_anonymous_avatar_48dp.png
rename to res/drawable-xhdpi/ic_anonymous_avatar_40dp.png
index dcb8b8f..67efeb1 100644
--- a/res/drawable-hdpi/ic_anonymous_avatar_48dp.png
+++ b/res/drawable-xhdpi/ic_anonymous_avatar_40dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_anonymous_avatar_48dp.png b/res/drawable-xhdpi/ic_anonymous_avatar_48dp.png
deleted file mode 100644
index 8d467d5..0000000
--- a/res/drawable-xhdpi/ic_anonymous_avatar_48dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_anonymous_avatar_40dp.png b/res/drawable-xxhdpi/ic_anonymous_avatar_40dp.png
new file mode 100644
index 0000000..b4229c9
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_anonymous_avatar_40dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_anonymous_avatar_48dp.png b/res/drawable-xxhdpi/ic_anonymous_avatar_48dp.png
deleted file mode 100644
index 0ccd71a..0000000
--- a/res/drawable-xxhdpi/ic_anonymous_avatar_48dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_anonymous_avatar_40dp.png b/res/drawable-xxxhdpi/ic_anonymous_avatar_40dp.png
new file mode 100644
index 0000000..6089d1e
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_anonymous_avatar_40dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_anonymous_avatar_48dp.png b/res/drawable-xxxhdpi/ic_anonymous_avatar_48dp.png
deleted file mode 100644
index 00832f2..0000000
--- a/res/drawable-xxxhdpi/ic_anonymous_avatar_48dp.png
+++ /dev/null
Binary files differ
diff --git a/src/com/android/mail/bitmap/ContactDrawable.java b/src/com/android/mail/bitmap/ContactDrawable.java
index df706e1..a9b243c 100644
--- a/src/com/android/mail/bitmap/ContactDrawable.java
+++ b/src/com/android/mail/bitmap/ContactDrawable.java
@@ -98,7 +98,7 @@
if (sTileLetterFontSize == 0) {
sTileLetterFontSize = res.getDimensionPixelSize(R.dimen.tile_letter_font_size_small);
sTileFontColor = res.getColor(R.color.letter_tile_font_color);
- DEFAULT_AVATAR = BitmapFactory.decodeResource(res, R.drawable.ic_anonymous_avatar_48dp);
+ DEFAULT_AVATAR = BitmapFactory.decodeResource(res, R.drawable.ic_anonymous_avatar_40dp);
sPaint.setTypeface(Typeface.create("sans-serif-light", Typeface.NORMAL));
sPaint.setTextAlign(Align.CENTER);
diff --git a/src/com/android/mail/photomanager/LetterTileProvider.java b/src/com/android/mail/photomanager/LetterTileProvider.java
index 8ab0aa8..2593e21 100644
--- a/src/com/android/mail/photomanager/LetterTileProvider.java
+++ b/src/com/android/mail/photomanager/LetterTileProvider.java
@@ -74,7 +74,7 @@
mPaint.setAntiAlias(true);
mBitmapBackgroundCache = new Bitmap[POSSIBLE_BITMAP_SIZES];
- mDefaultBitmap = BitmapFactory.decodeResource(res, R.drawable.ic_anonymous_avatar_48dp);
+ mDefaultBitmap = BitmapFactory.decodeResource(res, R.drawable.ic_anonymous_avatar_40dp);
mDefaultBitmapCache = new Bitmap[POSSIBLE_BITMAP_SIZES];
mTileColorPicker = colorPicker;
