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

Commit e6b62064 authored by Ivan Chiang's avatar Ivan Chiang
Browse files

Fix can't get correct root icon issue 

The check rule of getTypeInfo is changed. Use the correct mime types.

Test: manual
Change-Id: Iae068d2b6ad5db9554bca53931b56cd4677d2308
Fix: 125604756
parent cb1c5590

src/com/android/documentsui/base/MimeTypes.java

+4 −5
Original line number Diff line number Diff line
@@ -27,16 +27,15 @@ public final class MimeTypes { 
    public static final String APK_TYPE = "application/vnd.android.package-archive";

    public static final String GENERIC_TYPE = "application/*";



    public static final String IMAGE_PREFIX = "image";

    public static final String AUDIO_PREFIX = "audio";

    public static final String VIDEO_PREFIX = "video";

    public static final String IMAGE_MIME = "image/*";

    public static final String AUDIO_MIME = "audio/*";

    public static final String VIDEO_MIME = "video/*";



    /**

     * MIME types that are visual in nature. For example, they should always be

     * shown as thumbnails in list mode.

     */

    public static final String[] VISUAL_MIMES = new String[] { "image/*", "video/*" };

    public static final String IMAGE_MIME = "image/*";

    public static final String[] VISUAL_MIMES = new String[] { IMAGE_MIME, VIDEO_MIME };



    public static @Nullable String[] splitMimeType(String mimeType) {

        final String[] groups = mimeType.split("/");

src/com/android/documentsui/base/RootInfo.java

+3 −3
Original line number Diff line number Diff line
@@ -365,11 +365,11 @@ public class RootInfo implements Durable, Parcelable, Comparable<RootInfo> { 


        switch (derivedType) {

            case TYPE_IMAGES:

                return IconUtils.loadMimeIcon(context, MimeTypes.IMAGE_PREFIX);

                return IconUtils.loadMimeIcon(context, MimeTypes.IMAGE_MIME);

            case TYPE_AUDIO:

                return IconUtils.loadMimeIcon(context, MimeTypes.AUDIO_PREFIX);

                return IconUtils.loadMimeIcon(context, MimeTypes.AUDIO_MIME);

            case TYPE_VIDEO:

                return IconUtils.loadMimeIcon(context, MimeTypes.VIDEO_PREFIX);

                return IconUtils.loadMimeIcon(context, MimeTypes.VIDEO_MIME);

            default:

                return IconUtils.loadMimeIcon(context, MimeTypes.GENERIC_TYPE);

        }