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

Commit 39455174 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "TIF: change the column names to be consistent with other fields"

parents 45c87d94 eedc4b5b

api/current.txt

+5 −5
Original line number Diff line number Diff line
@@ -23943,6 +23943,7 @@ package android.media.tv { 
    field public static final java.lang.String AVAILABILITY_AVAILABLE = "AVAILABILITY_AVAILABLE";

    field public static final java.lang.String AVAILABILITY_FREE_WITH_SUBSCRIPTION = "AVAILABILITY_FREE_WITH_SUBSCRIPTION";

    field public static final java.lang.String AVAILABILITY_PAID_CONTENT = "AVAILABILITY_PAID_CONTENT";

    field public static final java.lang.String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri";

    field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language";

    field public static final java.lang.String COLUMN_AUTHOR = "author";

    field public static final java.lang.String COLUMN_AVAILABILITY = "availability";
@@ -23950,6 +23951,7 @@ package android.media.tv { 
    field public static final java.lang.String COLUMN_CANONICAL_GENRE = "canonical_genre";

    field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id";

    field public static final java.lang.String COLUMN_CONTENT_RATING = "content_rating";

    field public static final java.lang.String COLUMN_DURATION_MILLIS = "duration_millis";

    field public static final java.lang.String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";

    field public static final java.lang.String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";

    field public static final deprecated java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";
@@ -23963,17 +23965,14 @@ package android.media.tv { 
    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";

    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";

    field public static final java.lang.String COLUMN_ITEM_COUNT = "item_count";

    field public static final java.lang.String COLUMN_LAST_PLAYBACK_POSITION_MILLIS = "last_playback_position_millis";

    field public static final java.lang.String COLUMN_LIVE = "live";

    field public static final java.lang.String COLUMN_LOGO = "logo";

    field public static final java.lang.String COLUMN_LOGO_URI = "logo_uri";

    field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";

    field public static final java.lang.String COLUMN_OFFER_PRICE = "offer_price";

    field public static final java.lang.String COLUMN_POSTER_ART_ASPECT_RATIO = "poster_art_aspect_ratio";

    field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";

    field public static final java.lang.String COLUMN_PREVIEW_DURATION = "preview_duration";

    field public static final java.lang.String COLUMN_PREVIEW_INTENT_URI = "preview_intent_uri";

    field public static final java.lang.String COLUMN_PREVIEW_LAST_PLAYBACK_POSITION = "preview_last_playback_position";

    field public static final java.lang.String COLUMN_PREVIEW_VIDEO_URI = "preview_video_uri";

    field public static final java.lang.String COLUMN_PREVIEW_WEIGHT = "preview_weight";

    field public static final java.lang.String COLUMN_RECORDING_PROHIBITED = "recording_prohibited";

    field public static final java.lang.String COLUMN_RELEASE_DATE = "release_date";

    field public static final java.lang.String COLUMN_REVIEW_RATING = "review_rating";
@@ -23993,6 +23992,7 @@ package android.media.tv { 
    field public static final java.lang.String COLUMN_VIDEO_HEIGHT = "video_height";

    field public static final java.lang.String COLUMN_VIDEO_WIDTH = "video_width";

    field public static final java.lang.String COLUMN_WATCH_NEXT_TYPE = "watch_next_type";

    field public static final java.lang.String COLUMN_WEIGHT = "weight";

    field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/program";

    field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/program";

    field public static final android.net.Uri CONTENT_URI;

api/system-current.txt

+5 −5
Original line number Diff line number Diff line
@@ -25694,6 +25694,7 @@ package android.media.tv { 
    field public static final java.lang.String AVAILABILITY_AVAILABLE = "AVAILABILITY_AVAILABLE";

    field public static final java.lang.String AVAILABILITY_FREE_WITH_SUBSCRIPTION = "AVAILABILITY_FREE_WITH_SUBSCRIPTION";

    field public static final java.lang.String AVAILABILITY_PAID_CONTENT = "AVAILABILITY_PAID_CONTENT";

    field public static final java.lang.String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri";

    field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language";

    field public static final java.lang.String COLUMN_AUTHOR = "author";

    field public static final java.lang.String COLUMN_AVAILABILITY = "availability";
@@ -25701,6 +25702,7 @@ package android.media.tv { 
    field public static final java.lang.String COLUMN_CANONICAL_GENRE = "canonical_genre";

    field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id";

    field public static final java.lang.String COLUMN_CONTENT_RATING = "content_rating";

    field public static final java.lang.String COLUMN_DURATION_MILLIS = "duration_millis";

    field public static final java.lang.String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";

    field public static final java.lang.String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";

    field public static final deprecated java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";
@@ -25714,17 +25716,14 @@ package android.media.tv { 
    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";

    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";

    field public static final java.lang.String COLUMN_ITEM_COUNT = "item_count";

    field public static final java.lang.String COLUMN_LAST_PLAYBACK_POSITION_MILLIS = "last_playback_position_millis";

    field public static final java.lang.String COLUMN_LIVE = "live";

    field public static final java.lang.String COLUMN_LOGO = "logo";

    field public static final java.lang.String COLUMN_LOGO_URI = "logo_uri";

    field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";

    field public static final java.lang.String COLUMN_OFFER_PRICE = "offer_price";

    field public static final java.lang.String COLUMN_POSTER_ART_ASPECT_RATIO = "poster_art_aspect_ratio";

    field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";

    field public static final java.lang.String COLUMN_PREVIEW_DURATION = "preview_duration";

    field public static final java.lang.String COLUMN_PREVIEW_INTENT_URI = "preview_intent_uri";

    field public static final java.lang.String COLUMN_PREVIEW_LAST_PLAYBACK_POSITION = "preview_last_playback_position";

    field public static final java.lang.String COLUMN_PREVIEW_VIDEO_URI = "preview_video_uri";

    field public static final java.lang.String COLUMN_PREVIEW_WEIGHT = "preview_weight";

    field public static final java.lang.String COLUMN_RECORDING_PROHIBITED = "recording_prohibited";

    field public static final java.lang.String COLUMN_RELEASE_DATE = "release_date";

    field public static final java.lang.String COLUMN_REVIEW_RATING = "review_rating";
@@ -25745,6 +25744,7 @@ package android.media.tv { 
    field public static final java.lang.String COLUMN_VIDEO_HEIGHT = "video_height";

    field public static final java.lang.String COLUMN_VIDEO_WIDTH = "video_width";

    field public static final java.lang.String COLUMN_WATCH_NEXT_TYPE = "watch_next_type";

    field public static final java.lang.String COLUMN_WEIGHT = "weight";

    field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/program";

    field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/program";

    field public static final android.net.Uri CONTENT_URI;

api/test-current.txt

+5 −5
Original line number Diff line number Diff line
@@ -24035,6 +24035,7 @@ package android.media.tv { 
    field public static final java.lang.String AVAILABILITY_AVAILABLE = "AVAILABILITY_AVAILABLE";

    field public static final java.lang.String AVAILABILITY_FREE_WITH_SUBSCRIPTION = "AVAILABILITY_FREE_WITH_SUBSCRIPTION";

    field public static final java.lang.String AVAILABILITY_PAID_CONTENT = "AVAILABILITY_PAID_CONTENT";

    field public static final java.lang.String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri";

    field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language";

    field public static final java.lang.String COLUMN_AUTHOR = "author";

    field public static final java.lang.String COLUMN_AVAILABILITY = "availability";
@@ -24042,6 +24043,7 @@ package android.media.tv { 
    field public static final java.lang.String COLUMN_CANONICAL_GENRE = "canonical_genre";

    field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id";

    field public static final java.lang.String COLUMN_CONTENT_RATING = "content_rating";

    field public static final java.lang.String COLUMN_DURATION_MILLIS = "duration_millis";

    field public static final java.lang.String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";

    field public static final java.lang.String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";

    field public static final deprecated java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";
@@ -24055,17 +24057,14 @@ package android.media.tv { 
    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";

    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";

    field public static final java.lang.String COLUMN_ITEM_COUNT = "item_count";

    field public static final java.lang.String COLUMN_LAST_PLAYBACK_POSITION_MILLIS = "last_playback_position_millis";

    field public static final java.lang.String COLUMN_LIVE = "live";

    field public static final java.lang.String COLUMN_LOGO = "logo";

    field public static final java.lang.String COLUMN_LOGO_URI = "logo_uri";

    field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";

    field public static final java.lang.String COLUMN_OFFER_PRICE = "offer_price";

    field public static final java.lang.String COLUMN_POSTER_ART_ASPECT_RATIO = "poster_art_aspect_ratio";

    field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";

    field public static final java.lang.String COLUMN_PREVIEW_DURATION = "preview_duration";

    field public static final java.lang.String COLUMN_PREVIEW_INTENT_URI = "preview_intent_uri";

    field public static final java.lang.String COLUMN_PREVIEW_LAST_PLAYBACK_POSITION = "preview_last_playback_position";

    field public static final java.lang.String COLUMN_PREVIEW_VIDEO_URI = "preview_video_uri";

    field public static final java.lang.String COLUMN_PREVIEW_WEIGHT = "preview_weight";

    field public static final java.lang.String COLUMN_RECORDING_PROHIBITED = "recording_prohibited";

    field public static final java.lang.String COLUMN_RELEASE_DATE = "release_date";

    field public static final java.lang.String COLUMN_REVIEW_RATING = "review_rating";
@@ -24085,6 +24084,7 @@ package android.media.tv { 
    field public static final java.lang.String COLUMN_VIDEO_HEIGHT = "video_height";

    field public static final java.lang.String COLUMN_VIDEO_WIDTH = "video_width";

    field public static final java.lang.String COLUMN_WATCH_NEXT_TYPE = "watch_next_type";

    field public static final java.lang.String COLUMN_WEIGHT = "weight";

    field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/program";

    field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/program";

    field public static final android.net.Uri CONTENT_URI;

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

+7 −7
Original line number Diff line number Diff line
@@ -1665,7 +1665,7 @@ public final class TvContract { 
         *

         * <p>Type: TEXT

         */

        public static final String COLUMN_LOGO = "logo";

        public static final String COLUMN_LOGO_URI = "logo_uri";



        /**

         * The availability of this TV program.
@@ -1860,8 +1860,8 @@ public final class TvContract { 
         *

         * <p>Type: INTEGER

         */

        public static final String COLUMN_PREVIEW_LAST_PLAYBACK_POSITION =

                "preview_last_playback_position";

        public static final String COLUMN_LAST_PLAYBACK_POSITION_MILLIS =

                "last_playback_position_millis";



        /**

         * The duration (in milliseconds) of the preview video.
@@ -1872,7 +1872,7 @@ public final class TvContract { 
         *

         * <p>Type: INTEGER

         */

        public static final String COLUMN_PREVIEW_DURATION = "preview_duration";

        public static final String COLUMN_DURATION_MILLIS = "duration_millis";



        /**

         * The intent URI which is launched when the preview video is selected.
@@ -1885,8 +1885,8 @@ public final class TvContract { 
         *

         * <p>Type: TEXT

         */

        public static final String COLUMN_PREVIEW_INTENT_URI =

                "preview_intent_uri";

        public static final String COLUMN_APP_LINK_INTENT_URI =

                "app_link_intent_uri";



        /**

         * The weight of the preview program within the channel.
@@ -1900,7 +1900,7 @@ public final class TvContract { 
         *

         * <p>Type: INTEGER

         */

        public static final String COLUMN_PREVIEW_WEIGHT = "preview_weight";

        public static final String COLUMN_WEIGHT = "weight";



        /**

         * The flag indicating whether this program is transient or not.