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

Commit 1f765d22 authored by Jae Seo's avatar Jae Seo Committed by Android Git Automerger
Browse files

am 7a91fd62: am ac2c8908: Merge "TIF: Add more description to the poster art... 

am 7a91fd62: am ac2c8908: Merge "TIF: Add more description to the poster art and thumbnail columns" into mnc-dev

* commit '7a91fd62':
  TIF: Add more description to the poster art and thumbnail columns
parents 30dc121f 7a91fd62

media/java/android/media/tv/TvContract.java

+26 −3
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ public final class TvContract { 
        public static final String COLUMN_LOCKED = "locked";



        /**

         * The app badge icon of the app link template for this channel.

         * The URI for the app badge icon of the app link template for this channel.

         *

         * <p>This small icon is overlaid at the bottom of the poster art specified by

         * {@link #COLUMN_APP_LINK_POSTER_ART_URI}. The data in the column must be a URI in one of
@@ -736,9 +736,10 @@ public final class TvContract { 
        public static final String COLUMN_APP_LINK_ICON_URI = "app_link_icon_uri";



        /**

         * The poster art used as the background of the app link template for this channel.

         * The URI for the poster art used as the background of the app link template for this

         * channel.

         *

         * <p>The data in the column must be a URL or a URI in one of the following formats:

         * <p>The data in the column must be a URL, or a URI in one of the following formats:

         *

         * <ul>

         * <li>content ({@link android.content.ContentResolver#SCHEME_CONTENT})</li>
@@ -1100,6 +1101,15 @@ public final class TvContract { 
        /**

         * The URI for the poster art of this TV program.

         *

         * <p>The data in the column must be a URL, or a URI in one of the following formats:

         *

         * <ul>

         * <li>content ({@link android.content.ContentResolver#SCHEME_CONTENT})</li>

         * <li>android.resource ({@link android.content.ContentResolver#SCHEME_ANDROID_RESOURCE})

         * </li>

         * <li>file ({@link android.content.ContentResolver#SCHEME_FILE})</li>

         * </ul>

         *

         * <p>Can be empty.

         *

         * <p>Type: TEXT
@@ -1109,6 +1119,19 @@ public final class TvContract { 
        /**

         * The URI for the thumbnail of this TV program.

         *

         * <p>The system can generate a thumbnail from the poster art if this column is not

         * specified. Thus it is not necessary for TV input services to include a thumbnail if it is

         * just a scaled image of the poster art.

         *

         * <p>The data in the column must be a URL, or a URI in one of the following formats:

         *

         * <ul>

         * <li>content ({@link android.content.ContentResolver#SCHEME_CONTENT})</li>

         * <li>android.resource ({@link android.content.ContentResolver#SCHEME_ANDROID_RESOURCE})

         * </li>

         * <li>file ({@link android.content.ContentResolver#SCHEME_FILE})</li>

         * </ul>

         *

         * <p>Can be empty.

         *

         * <p>Type: TEXT