| commit | c2c670d15aa0b0c3120b0a58cbf1473c1647a874 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Jun 29 17:24:42 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 29 17:24:42 2020 +0000 |
| tree | 0f0b1e24cac19ace4d07702641a16c1d8a113dc7 | |
| parent | d9620cc15501561e0c02fe6bd41aa864e58b04b2 [diff] | |
| parent | 55aa308fcbc9a14d4d0721efdd422a4114bda9ae [diff] |
Merge "Fix NoSuchMethodError for getTypeInfo()" am: 919cb6afdd am: d67e1db151 am: 55aa308fcb Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1352082 Change-Id: I4a03b98f431b696afacbb842426db3fcf9ed7421
diff --git a/res/drawable-hdpi/ic_music.png b/res/drawable-hdpi/ic_music.png new file mode 100644 index 0000000..033b402 --- /dev/null +++ b/res/drawable-hdpi/ic_music.png Binary files differ
diff --git a/res/drawable-hdpi/ic_photo_library_light.png b/res/drawable-hdpi/ic_photo_library_light.png index 1f71a62..55b956a 100644 --- a/res/drawable-hdpi/ic_photo_library_light.png +++ b/res/drawable-hdpi/ic_photo_library_light.png Binary files differ
diff --git a/res/drawable-mdpi/ic_music.png b/res/drawable-mdpi/ic_music.png new file mode 100644 index 0000000..106f912 --- /dev/null +++ b/res/drawable-mdpi/ic_music.png Binary files differ
diff --git a/res/drawable-mdpi/ic_photo_library_light.png b/res/drawable-mdpi/ic_photo_library_light.png index 322d486..26c58f3 100644 --- a/res/drawable-mdpi/ic_photo_library_light.png +++ b/res/drawable-mdpi/ic_photo_library_light.png Binary files differ
diff --git a/res/drawable-xhdpi/ic_music.png b/res/drawable-xhdpi/ic_music.png new file mode 100644 index 0000000..1de4c3b --- /dev/null +++ b/res/drawable-xhdpi/ic_music.png Binary files differ
diff --git a/res/drawable-xhdpi/ic_photo_library_light.png b/res/drawable-xhdpi/ic_photo_library_light.png index 1f5a69c..627ff48 100644 --- a/res/drawable-xhdpi/ic_photo_library_light.png +++ b/res/drawable-xhdpi/ic_photo_library_light.png Binary files differ
diff --git a/res/drawable-xxhdpi/ic_music.png b/res/drawable-xxhdpi/ic_music.png new file mode 100644 index 0000000..f8016cc --- /dev/null +++ b/res/drawable-xxhdpi/ic_music.png Binary files differ
diff --git a/res/drawable-xxhdpi/ic_photo_library_light.png b/res/drawable-xxhdpi/ic_photo_library_light.png index f61bb58..cd72bdf 100644 --- a/res/drawable-xxhdpi/ic_photo_library_light.png +++ b/res/drawable-xxhdpi/ic_photo_library_light.png Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_music.png b/res/drawable-xxxhdpi/ic_music.png new file mode 100644 index 0000000..11d67ae --- /dev/null +++ b/res/drawable-xxxhdpi/ic_music.png Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_photo_library_light.png b/res/drawable-xxxhdpi/ic_photo_library_light.png index 8627f42..9fe62f4 100644 --- a/res/drawable-xxxhdpi/ic_photo_library_light.png +++ b/res/drawable-xxxhdpi/ic_photo_library_light.png Binary files differ
diff --git a/src/com/android/messaging/ui/mediapicker/GalleryGridItemView.java b/src/com/android/messaging/ui/mediapicker/GalleryGridItemView.java index 48eaa5d..6cf509b 100644 --- a/src/com/android/messaging/ui/mediapicker/GalleryGridItemView.java +++ b/src/com/android/messaging/ui/mediapicker/GalleryGridItemView.java
@@ -161,14 +161,9 @@ } else { final String contentType = mData.getContentType(); if (ContentType.isAudioType(contentType)) { - final Context context = getContext(); setBackgroundColor( getResources().getColor(R.color.gallery_image_default_background)); - mIcon.setImageDrawable( - context.getContentResolver() - .getTypeInfo(contentType) - .getIcon() - .loadDrawable(context)); + mIcon.setImageResource(R.drawable.ic_music); mIcon.setColorFilter( ConversationDrawables.get().getConversationThemeColor(), PorterDuff.Mode.SRC_IN);
