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

Commit 7d8875a1 authored by Dongwon Kang's avatar Dongwon Kang Committed by Android (Google) Code Review
Browse files

Merge "TIF: add PreviewPrograms"

parents ce14bf03 4683b83c

api/current.txt

+18 −9
Original line number Diff line number Diff line
@@ -23972,6 +23972,9 @@ package android.media.tv { 
    method public static final android.net.Uri buildChannelUriForPassthroughInput(java.lang.String);

    method public static final android.net.Uri buildChannelsUriForInput(java.lang.String);

    method public static final java.lang.String buildInputId(android.content.ComponentName);

    method public static final android.net.Uri buildPreviewProgramUri(long);

    method public static final android.net.Uri buildPreviewProgramsUriForChannel(long);

    method public static final android.net.Uri buildPreviewProgramsUriForChannel(android.net.Uri);

    method public static final android.net.Uri buildProgramUri(long);

    method public static final android.net.Uri buildProgramsUriForChannel(long);

    method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri);
@@ -24093,7 +24096,7 @@ package android.media.tv { 
    field public static final java.lang.String CONTENT_DIRECTORY = "logo";

  }









  public static final class TvContract.Programs implements android.media.tv.TvContract.BaseProgramColumns {









  public static final class TvContract.PreviewPrograms implements android.media.tv.TvContract.BaseProgramColumns {









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









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









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








@@ -24104,11 +24107,8 @@ package android.media.tv {







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









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









    field public static final java.lang.String COLUMN_AVAILABILITY = "availability";









    field public static final java.lang.String COLUMN_BROADCAST_GENRE = "broadcast_genre";









    field public static final java.lang.String COLUMN_BROWSABLE = "browsable";









    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 deprecated java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";









    field public static final java.lang.String COLUMN_INTERACTION_COUNT = "interaction_count";









    field public static final java.lang.String COLUMN_INTERACTION_TYPE = "interaction_type";









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








@@ -24119,19 +24119,16 @@ package android.media.tv {







    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_PREVIEW_VIDEO_URI = "preview_video_uri";









    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";









    field public static final java.lang.String COLUMN_REVIEW_RATING_STYLE = "review_rating_style";









    field public static final deprecated java.lang.String COLUMN_SEASON_NUMBER = "season_number";









    field public static final java.lang.String COLUMN_STARTING_PRICE = "starting_price";









    field public static final java.lang.String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";









    field public static final java.lang.String COLUMN_THUMBNAIL_ASPECT_RATIO = "poster_thumbnail_aspect_ratio";









    field public static final java.lang.String COLUMN_TYPE = "type";









    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 java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/preview_program";









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









    field public static final android.net.Uri CONTENT_URI;









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









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








@@ -24160,6 +24157,18 @@ package android.media.tv {







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









  }

















  public static final class TvContract.Programs implements android.media.tv.TvContract.BaseProgramColumns {









    field public static final java.lang.String COLUMN_BROADCAST_GENRE = "broadcast_genre";









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









    field public static final deprecated java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";









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









    field public static final deprecated java.lang.String COLUMN_SEASON_NUMBER = "season_number";









    field public static final java.lang.String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";









    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;









  }

















  public static final class TvContract.Programs.Genres {









    method public static java.lang.String[] decode(java.lang.String);









    method public static java.lang.String encode(java.lang.String...);

























api/system-current.txt



+18
−9






























Original line number
Diff line number
Diff line







@@ -25759,6 +25759,9 @@ package android.media.tv {







    method public static final android.net.Uri buildChannelsUriForInput(java.lang.String, boolean);









    method public static final android.net.Uri buildChannelsUriForInput(java.lang.String, java.lang.String, boolean);









    method public static final java.lang.String buildInputId(android.content.ComponentName);









    method public static final android.net.Uri buildPreviewProgramUri(long);









    method public static final android.net.Uri buildPreviewProgramsUriForChannel(long);









    method public static final android.net.Uri buildPreviewProgramsUriForChannel(android.net.Uri);









    method public static final android.net.Uri buildProgramUri(long);









    method public static final android.net.Uri buildProgramsUriForChannel(long);









    method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri);








@@ -25884,7 +25887,7 @@ package android.media.tv {







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









  }

















  public static final class TvContract.Programs implements android.media.tv.TvContract.BaseProgramColumns {









  public static final class TvContract.PreviewPrograms implements android.media.tv.TvContract.BaseProgramColumns {









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









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









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








@@ -25895,11 +25898,8 @@ package android.media.tv {







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









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









    field public static final java.lang.String COLUMN_AVAILABILITY = "availability";









    field public static final java.lang.String COLUMN_BROADCAST_GENRE = "broadcast_genre";









    field public static final java.lang.String COLUMN_BROWSABLE = "browsable";









    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 deprecated java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";









    field public static final java.lang.String COLUMN_INTERACTION_COUNT = "interaction_count";









    field public static final java.lang.String COLUMN_INTERACTION_TYPE = "interaction_type";









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








@@ -25910,20 +25910,17 @@ package android.media.tv {







    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_PREVIEW_VIDEO_URI = "preview_video_uri";









    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";









    field public static final java.lang.String COLUMN_REVIEW_RATING_STYLE = "review_rating_style";









    field public static final deprecated java.lang.String COLUMN_SEASON_NUMBER = "season_number";









    field public static final java.lang.String COLUMN_STARTING_PRICE = "starting_price";









    field public static final java.lang.String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";









    field public static final java.lang.String COLUMN_THUMBNAIL_ASPECT_RATIO = "poster_thumbnail_aspect_ratio";









    field public static final java.lang.String COLUMN_TRANSIENT = "transient";









    field public static final java.lang.String COLUMN_TYPE = "type";









    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 java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/preview_program";









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









    field public static final android.net.Uri CONTENT_URI;









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









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








@@ -25952,6 +25949,18 @@ package android.media.tv {







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









  }

















  public static final class TvContract.Programs implements android.media.tv.TvContract.BaseProgramColumns {









    field public static final java.lang.String COLUMN_BROADCAST_GENRE = "broadcast_genre";









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









    field public static final deprecated java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";









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









    field public static final deprecated java.lang.String COLUMN_SEASON_NUMBER = "season_number";









    field public static final java.lang.String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";









    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;









  }

















  public static final class TvContract.Programs.Genres {









    method public static java.lang.String[] decode(java.lang.String);









    method public static java.lang.String encode(java.lang.String...);

























api/test-current.txt



+18
−9






























Original line number
Diff line number
Diff line







@@ -24067,6 +24067,9 @@ package android.media.tv {







    method public static final android.net.Uri buildChannelUriForPassthroughInput(java.lang.String);









    method public static final android.net.Uri buildChannelsUriForInput(java.lang.String);









    method public static final java.lang.String buildInputId(android.content.ComponentName);









    method public static final android.net.Uri buildPreviewProgramUri(long);









    method public static final android.net.Uri buildPreviewProgramsUriForChannel(long);









    method public static final android.net.Uri buildPreviewProgramsUriForChannel(android.net.Uri);









    method public static final android.net.Uri buildProgramUri(long);









    method public static final android.net.Uri buildProgramsUriForChannel(long);









    method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri);








@@ -24188,7 +24191,7 @@ package android.media.tv {







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









  }

















  public static final class TvContract.Programs implements android.media.tv.TvContract.BaseProgramColumns {









  public static final class TvContract.PreviewPrograms implements android.media.tv.TvContract.BaseProgramColumns {









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









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









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








@@ -24199,11 +24202,8 @@ package android.media.tv {







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









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









    field public static final java.lang.String COLUMN_AVAILABILITY = "availability";









    field public static final java.lang.String COLUMN_BROADCAST_GENRE = "broadcast_genre";









    field public static final java.lang.String COLUMN_BROWSABLE = "browsable";









    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 deprecated java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";









    field public static final java.lang.String COLUMN_INTERACTION_COUNT = "interaction_count";









    field public static final java.lang.String COLUMN_INTERACTION_TYPE = "interaction_type";









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








@@ -24214,19 +24214,16 @@ package android.media.tv {







    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_PREVIEW_VIDEO_URI = "preview_video_uri";









    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";









    field public static final java.lang.String COLUMN_REVIEW_RATING_STYLE = "review_rating_style";









    field public static final deprecated java.lang.String COLUMN_SEASON_NUMBER = "season_number";









    field public static final java.lang.String COLUMN_STARTING_PRICE = "starting_price";









    field public static final java.lang.String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";









    field public static final java.lang.String COLUMN_THUMBNAIL_ASPECT_RATIO = "poster_thumbnail_aspect_ratio";









    field public static final java.lang.String COLUMN_TYPE = "type";









    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 java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/preview_program";









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









    field public static final android.net.Uri CONTENT_URI;









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









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








@@ -24255,6 +24252,18 @@ package android.media.tv {







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









  }

















  public static final class TvContract.Programs implements android.media.tv.TvContract.BaseProgramColumns {









    field public static final java.lang.String COLUMN_BROADCAST_GENRE = "broadcast_genre";









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









    field public static final deprecated java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";









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









    field public static final deprecated java.lang.String COLUMN_SEASON_NUMBER = "season_number";









    field public static final java.lang.String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";









    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;









  }

















  public static final class TvContract.Programs.Genres {









    method public static java.lang.String[] decode(java.lang.String);









    method public static java.lang.String encode(java.lang.String...);