Merge "Fix NoSuchMethodError for getTypeInfo()" am: 919cb6afdd

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1352082

Change-Id: I3c817f847749649e3540e3827263cc8f7184f2b3
This commit is contained in:
Treehugger Robot
2020-06-29 16:53:27 +00:00
committed by Automerger Merge Worker
11 changed files with 1 additions and 6 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 326 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 994 B

After

Width:  |  Height:  |  Size: 468 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 230 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 772 B

After

Width:  |  Height:  |  Size: 339 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 431 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 579 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 634 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 816 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 759 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 553 B

After

Width:  |  Height:  |  Size: 1.0 KiB

@@ -161,14 +161,9 @@ public class GalleryGridItemView extends FrameLayout {
} else { } else {
final String contentType = mData.getContentType(); final String contentType = mData.getContentType();
if (ContentType.isAudioType(contentType)) { if (ContentType.isAudioType(contentType)) {
final Context context = getContext();
setBackgroundColor( setBackgroundColor(
getResources().getColor(R.color.gallery_image_default_background)); getResources().getColor(R.color.gallery_image_default_background));
mIcon.setImageDrawable( mIcon.setImageResource(R.drawable.ic_music);
context.getContentResolver()
.getTypeInfo(contentType)
.getIcon()
.loadDrawable(context));
mIcon.setColorFilter( mIcon.setColorFilter(
ConversationDrawables.get().getConversationThemeColor(), ConversationDrawables.get().getConversationThemeColor(),
PorterDuff.Mode.SRC_IN); PorterDuff.Mode.SRC_IN);