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

Commit 679025e6 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Initial support for subtitles and lyrics."

parents 90667948 257b6bff

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -38908,6 +38908,7 @@ package android.provider { 
    field public static final int MEDIA_TYPE_IMAGE = 1; // 0x1

    field public static final int MEDIA_TYPE_NONE = 0; // 0x0

    field public static final int MEDIA_TYPE_PLAYLIST = 4; // 0x4

    field public static final int MEDIA_TYPE_SUBTITLE = 5; // 0x5

    field public static final int MEDIA_TYPE_VIDEO = 3; // 0x3

    field public static final String MIME_TYPE = "mime_type";

    field public static final String PARENT = "parent";

core/java/android/provider/MediaStore.java

+15 −5
Original line number Diff line number Diff line
@@ -1592,30 +1592,40 @@ public final class MediaStore { 


            /**

             * Constant for the {@link #MEDIA_TYPE} column indicating that file

             * is not an audio, image, video or playlist file.

             * is not an audio, image, video, playlist, or subtitles file.

             */

            public static final int MEDIA_TYPE_NONE = 0;



            /**

             * Constant for the {@link #MEDIA_TYPE} column indicating that file is an image file.

             * Constant for the {@link #MEDIA_TYPE} column indicating that file

             * is an image file.

             */

            public static final int MEDIA_TYPE_IMAGE = 1;



            /**

             * Constant for the {@link #MEDIA_TYPE} column indicating that file is an audio file.

             * Constant for the {@link #MEDIA_TYPE} column indicating that file

             * is an audio file.

             */

            public static final int MEDIA_TYPE_AUDIO = 2;



            /**

             * Constant for the {@link #MEDIA_TYPE} column indicating that file is a video file.

             * Constant for the {@link #MEDIA_TYPE} column indicating that file

             * is a video file.

             */

            public static final int MEDIA_TYPE_VIDEO = 3;



            /**

             * Constant for the {@link #MEDIA_TYPE} column indicating that file is a playlist file.

             * Constant for the {@link #MEDIA_TYPE} column indicating that file

             * is a playlist file.

             */

            public static final int MEDIA_TYPE_PLAYLIST = 4;



            /**

             * Constant for the {@link #MEDIA_TYPE} column indicating that file

             * is a subtitles or lyrics file.

             */

            public static final int MEDIA_TYPE_SUBTITLE = 5;



            /**

             * Column indicating if the file is part of Downloads collection.

             * @hide