diff options
author | James Lemieux <jplemieux@google.com> | 2014-08-18 18:05:19 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-16 04:01:11 +0000 |
commit | c1700e338cbb26b7f35b4db9c46d81c78ae74cbe (patch) | |
tree | 42bdb6d17123eba919af073c0df7215c4a3088b8 | |
parent | 47da4ce65aebb78dde6c3ce273e95b547360bec2 (diff) | |
parent | 0617562219869efe1fc3fd92170f1f8535397f51 (diff) | |
download | android_packages_apps_UnifiedEmail-c1700e338cbb26b7f35b4db9c46d81c78ae74cbe.tar.gz android_packages_apps_UnifiedEmail-c1700e338cbb26b7f35b4db9c46d81c78ae74cbe.tar.bz2 android_packages_apps_UnifiedEmail-c1700e338cbb26b7f35b4db9c46d81c78ae74cbe.zip |
Merge "Update the checkmark asset in the Thread List" into ub-gmail-ur14-dev
-rw-r--r-- | res/drawable-hdpi/ic_avatar_check.png | bin | 1072 -> 0 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_check_wht_24dp.png | bin | 0 -> 341 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_avatar_check.png | bin | 819 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_check_wht_24dp.png | bin | 0 -> 295 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_avatar_check.png | bin | 1341 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_check_wht_24dp.png | bin | 0 -> 402 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_avatar_check.png | bin | 2187 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_check_wht_24dp.png | bin | 0 -> 449 bytes | |||
-rw-r--r-- | src/com/android/mail/bitmap/CheckableContactFlipDrawable.java | 2 |
9 files changed, 1 insertions, 1 deletions
diff --git a/res/drawable-hdpi/ic_avatar_check.png b/res/drawable-hdpi/ic_avatar_check.png Binary files differdeleted file mode 100644 index e904f7d14..000000000 --- a/res/drawable-hdpi/ic_avatar_check.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_check_wht_24dp.png b/res/drawable-hdpi/ic_check_wht_24dp.png Binary files differnew file mode 100644 index 000000000..12ce8e0de --- /dev/null +++ b/res/drawable-hdpi/ic_check_wht_24dp.png diff --git a/res/drawable-mdpi/ic_avatar_check.png b/res/drawable-mdpi/ic_avatar_check.png Binary files differdeleted file mode 100644 index 122419983..000000000 --- a/res/drawable-mdpi/ic_avatar_check.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_check_wht_24dp.png b/res/drawable-mdpi/ic_check_wht_24dp.png Binary files differnew file mode 100644 index 000000000..c7de70503 --- /dev/null +++ b/res/drawable-mdpi/ic_check_wht_24dp.png diff --git a/res/drawable-xhdpi/ic_avatar_check.png b/res/drawable-xhdpi/ic_avatar_check.png Binary files differdeleted file mode 100644 index 6bc3d92f3..000000000 --- a/res/drawable-xhdpi/ic_avatar_check.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_check_wht_24dp.png b/res/drawable-xhdpi/ic_check_wht_24dp.png Binary files differnew file mode 100644 index 000000000..e34b73e55 --- /dev/null +++ b/res/drawable-xhdpi/ic_check_wht_24dp.png diff --git a/res/drawable-xxhdpi/ic_avatar_check.png b/res/drawable-xxhdpi/ic_avatar_check.png Binary files differdeleted file mode 100644 index 9acf6c4e6..000000000 --- a/res/drawable-xxhdpi/ic_avatar_check.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_check_wht_24dp.png b/res/drawable-xxhdpi/ic_check_wht_24dp.png Binary files differnew file mode 100644 index 000000000..4c6a653ff --- /dev/null +++ b/res/drawable-xxhdpi/ic_check_wht_24dp.png diff --git a/src/com/android/mail/bitmap/CheckableContactFlipDrawable.java b/src/com/android/mail/bitmap/CheckableContactFlipDrawable.java index f590919ce..58144e338 100644 --- a/src/com/android/mail/bitmap/CheckableContactFlipDrawable.java +++ b/src/com/android/mail/bitmap/CheckableContactFlipDrawable.java @@ -146,7 +146,7 @@ public class CheckableContactFlipDrawable extends FlipDrawable implements Animat public CheckmarkDrawable(final Resources res) { if (CHECKMARK == null) { - CHECKMARK = BitmapFactory.decodeResource(res, R.drawable.ic_avatar_check); + CHECKMARK = BitmapFactory.decodeResource(res, R.drawable.ic_check_wht_24dp); sBackgroundColor = res.getColor(R.color.checkmark_tile_background_color); } mPaint = new Paint(); |