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

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

Merge changes I50bf7c36,Ibb40ed39 

* changes:
  TIF: Add types and "watch next" types for programs
  TIF: Add more fields needed for new content recommendation
parents eea27893 434602fa

api/current.txt

+34 −1
Original line number Diff line number Diff line
@@ -23851,8 +23851,16 @@ package android.media.tv { 
  }















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













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













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













    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_AUDIO_LANGUAGE = "audio_language";















    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_CANONICAL_GENRE = "canonical_genre";















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









@@ -23869,7 +23877,12 @@ package android.media.tv {













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";















    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_LIVE = "live";













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















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









@@ -23877,6 +23890,7 @@ package android.media.tv {













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















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















    field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";









@@ -23884,12 +23898,16 @@ package android.media.tv {













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















    field public static final java.lang.String COLUMN_SEASON_TITLE = "season_title";















    field public static final java.lang.String COLUMN_SHORT_DESCRIPTION = "short_description";













    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_THUMBNAIL_URI = "thumbnail_uri";















    field public static final java.lang.String COLUMN_TITLE = "title";













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















    field public static final java.lang.String COLUMN_VERSION_NUMBER = "version_number";















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









@@ -23902,7 +23920,22 @@ package android.media.tv {













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















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















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













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













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













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













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













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













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













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













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













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













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













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













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













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













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













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













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













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















  }





























  public static final class TvContract.Programs.Genres {

























api/system-current.txt



+34
−1




























Original line number
Diff line number
Diff line








@@ -25598,8 +25598,16 @@ package android.media.tv {













  }





























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













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













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













    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_AUDIO_LANGUAGE = "audio_language";















    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_CANONICAL_GENRE = "canonical_genre";















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









@@ -25616,7 +25624,12 @@ package android.media.tv {













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";















    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_LIVE = "live";













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















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









@@ -25624,6 +25637,7 @@ package android.media.tv {













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















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















    field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";









@@ -25631,13 +25645,17 @@ package android.media.tv {













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















    field public static final java.lang.String COLUMN_SEASON_TITLE = "season_title";















    field public static final java.lang.String COLUMN_SHORT_DESCRIPTION = "short_description";













    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_THUMBNAIL_URI = "thumbnail_uri";















    field public static final java.lang.String COLUMN_TITLE = "title";















    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_VERSION_NUMBER = "version_number";















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









@@ -25650,7 +25668,22 @@ package android.media.tv {













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















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















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













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













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













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













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













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













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













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













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













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













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













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













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













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













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













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













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













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















  }





























  public static final class TvContract.Programs.Genres {

























api/test-current.txt



+34
−1




























Original line number
Diff line number
Diff line








@@ -23942,8 +23942,16 @@ package android.media.tv {













  }





























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













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













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













    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_AUDIO_LANGUAGE = "audio_language";















    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_CANONICAL_GENRE = "canonical_genre";















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









@@ -23960,7 +23968,12 @@ package android.media.tv {













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";















    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_LIVE = "live";













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















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









@@ -23968,6 +23981,7 @@ package android.media.tv {













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















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















    field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";









@@ -23975,12 +23989,16 @@ package android.media.tv {













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















    field public static final java.lang.String COLUMN_SEASON_TITLE = "season_title";















    field public static final java.lang.String COLUMN_SHORT_DESCRIPTION = "short_description";













    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_THUMBNAIL_URI = "thumbnail_uri";















    field public static final java.lang.String COLUMN_TITLE = "title";













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















    field public static final java.lang.String COLUMN_VERSION_NUMBER = "version_number";















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









@@ -23993,7 +24011,22 @@ package android.media.tv {













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















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















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













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













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













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













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













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













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













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













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













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













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













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













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













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













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













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













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













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















  }





























  public static final class TvContract.Programs.Genres {

























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



+313
−4


























File changed.
Preview size limit exceeded, changes collapsed.