Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a0ef1b8 authored by Ivan Chiang's avatar Ivan Chiang
Browse files

Fix doesn't show mime icon issue 

If we can't get the thumbnail, we need to show mime icon.

Test: manual
Bug: 122338652
Change-Id: Ibcb1691995f119616719bb03ac85f6ebabd20992
parent 99ade1fb

src/com/android/documentsui/dirlist/IconHelper.java

+9 −13
Original line number Diff line number Diff line
@@ -27,11 +27,12 @@ import android.graphics.drawable.Drawable; 
import android.net.Uri;

import android.provider.DocumentsContract;

import android.provider.DocumentsContract.Document;

import androidx.annotation.Nullable;

import android.util.Log;

import android.view.View;

import android.widget.ImageView;



import androidx.annotation.Nullable;



import com.android.documentsui.DocumentsApplication;

import com.android.documentsui.IconUtils;

import com.android.documentsui.ProviderExecutor;
@@ -45,7 +46,6 @@ import com.android.documentsui.base.State; 
import com.android.documentsui.base.State.ViewMode;



import java.util.function.BiConsumer;

import java.util.function.Consumer;



/**

 * A class to assist with loading and managing the Images (i.e. thumbnails and icons) associated
@@ -200,18 +200,14 @@ public class IconHelper { 
                        (cachedThumbnail == null ? ThumbnailLoader.ANIM_FADE_IN :

                                ThumbnailLoader.ANIM_NO_OP);



                Consumer<Bitmap> callback = new Consumer<Bitmap>() {

                    @Override

                    public void accept(Bitmap bitmap) {

                        if (result != null) {

                final ThumbnailLoader task = new ThumbnailLoader(uri, iconThumb,

                        mCurrentSize, docLastModified,

                        bitmap -> {

                            if (bitmap != null) {

                                iconThumb.setImageBitmap(bitmap);

                                animator.accept(iconMime, iconThumb);

                            }

                    }

                };



                final ThumbnailLoader task = new ThumbnailLoader(uri, iconThumb,

                    mCurrentSize, docLastModified, callback, true);

                        }, true /* addToCache */);



                ProviderExecutor.forAuthority(docAuthority).execute(task);

            }