Merge "TIF: Add COLUMN_SEASON_TITLE and COLUMN_(SEASON|EPISODE)_DISPLAY_NUMBER" into nyc-dev (b4caa028) · Commits · e / os / android_frameworks_base

api/current.txt

+8 −4

Original line number	Diff line number	Diff line
		@@ -22852,7 +22852,8 @@ package android.media.tv {
		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_END_TIME_UTC_MILLIS = "end_time_utc_millis";
		field public static final java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";
		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";
		field public static final java.lang.String COLUMN_EPISODE_TITLE = "episode_title";
		field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";
		field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";
		@@ -22862,7 +22863,9 @@ package android.media.tv {
		field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";
		field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";
		field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";
		field public static final java.lang.String COLUMN_SEASON_NUMBER = "season_number";
		field public static final java.lang.String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_number";
		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_START_TIME_UTC_MILLIS = "start_time_utc_millis";
		field public static final java.lang.String COLUMN_THUMBNAIL_URI = "thumbnail_uri";
		@@ -22905,7 +22908,7 @@ package android.media.tv {
		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_END_TIME_UTC_MILLIS = "end_time_utc_millis";
		field public static final java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";
		field public static final java.lang.String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";
		field public static final java.lang.String COLUMN_EPISODE_TITLE = "episode_title";
		field public static final java.lang.String COLUMN_INPUT_ID = "input_id";
		field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";
		@@ -22920,7 +22923,8 @@ package android.media.tv {
		field public static final java.lang.String COLUMN_RECORDING_DURATION_MILLIS = "recording_duration_millis";
		field public static final java.lang.String COLUMN_RECORDING_EXPIRE_TIME_UTC_MILLIS = "recording_expire_time_utc_millis";
		field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";
		field public static final java.lang.String COLUMN_SEASON_NUMBER = "season_number";
		field public static final java.lang.String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_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_START_TIME_UTC_MILLIS = "start_time_utc_millis";
		field public static final java.lang.String COLUMN_THUMBNAIL_URI = "thumbnail_uri";

api/system-current.txt

+8 −4

Original line number	Diff line number	Diff line
		@@ -24484,7 +24484,8 @@ package android.media.tv {
		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_END_TIME_UTC_MILLIS = "end_time_utc_millis";
		field public static final java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";
		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";
		field public static final java.lang.String COLUMN_EPISODE_TITLE = "episode_title";
		field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";
		field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";
		@@ -24494,7 +24495,9 @@ package android.media.tv {
		field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";
		field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";
		field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";
		field public static final java.lang.String COLUMN_SEASON_NUMBER = "season_number";
		field public static final java.lang.String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_number";
		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_START_TIME_UTC_MILLIS = "start_time_utc_millis";
		field public static final java.lang.String COLUMN_THUMBNAIL_URI = "thumbnail_uri";
		@@ -24537,7 +24540,7 @@ package android.media.tv {
		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_END_TIME_UTC_MILLIS = "end_time_utc_millis";
		field public static final java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";
		field public static final java.lang.String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";
		field public static final java.lang.String COLUMN_EPISODE_TITLE = "episode_title";
		field public static final java.lang.String COLUMN_INPUT_ID = "input_id";
		field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";
		@@ -24552,7 +24555,8 @@ package android.media.tv {
		field public static final java.lang.String COLUMN_RECORDING_DURATION_MILLIS = "recording_duration_millis";
		field public static final java.lang.String COLUMN_RECORDING_EXPIRE_TIME_UTC_MILLIS = "recording_expire_time_utc_millis";
		field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";
		field public static final java.lang.String COLUMN_SEASON_NUMBER = "season_number";
		field public static final java.lang.String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_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_START_TIME_UTC_MILLIS = "start_time_utc_millis";
		field public static final java.lang.String COLUMN_THUMBNAIL_URI = "thumbnail_uri";

api/test-current.txt

+8 −4

Original line number	Diff line number	Diff line
		@@ -22861,7 +22861,8 @@ package android.media.tv {
		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_END_TIME_UTC_MILLIS = "end_time_utc_millis";
		field public static final java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";
		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";
		field public static final java.lang.String COLUMN_EPISODE_TITLE = "episode_title";
		field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";
		field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";
		@@ -22871,7 +22872,9 @@ package android.media.tv {
		field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";
		field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";
		field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";
		field public static final java.lang.String COLUMN_SEASON_NUMBER = "season_number";
		field public static final java.lang.String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_number";
		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_START_TIME_UTC_MILLIS = "start_time_utc_millis";
		field public static final java.lang.String COLUMN_THUMBNAIL_URI = "thumbnail_uri";
		@@ -22914,7 +22917,7 @@ package android.media.tv {
		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_END_TIME_UTC_MILLIS = "end_time_utc_millis";
		field public static final java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";
		field public static final java.lang.String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";
		field public static final java.lang.String COLUMN_EPISODE_TITLE = "episode_title";
		field public static final java.lang.String COLUMN_INPUT_ID = "input_id";
		field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";
		@@ -22929,7 +22932,8 @@ package android.media.tv {
		field public static final java.lang.String COLUMN_RECORDING_DURATION_MILLIS = "recording_duration_millis";
		field public static final java.lang.String COLUMN_RECORDING_EXPIRE_TIME_UTC_MILLIS = "recording_expire_time_utc_millis";
		field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";
		field public static final java.lang.String COLUMN_SEASON_NUMBER = "season_number";
		field public static final java.lang.String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_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_START_TIME_UTC_MILLIS = "start_time_utc_millis";
		field public static final java.lang.String COLUMN_THUMBNAIL_URI = "thumbnail_uri";

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

+82 −12

Original line number	Diff line number	Diff line
		@@ -965,8 +965,9 @@ public final class TvContract {
		* The title of this TV program.
		*
		* <p>If this program is an episodic TV show, it is recommended that the title is the series
		* title and its related fields ({@link #COLUMN_SEASON_NUMBER},
		* {@link #COLUMN_EPISODE_NUMBER}, and {@link #COLUMN_EPISODE_TITLE}) are filled in.
		* title and its related fields ({@link #COLUMN_SEASON_TITLE} and/or
		* {@link #COLUMN_SEASON_DISPLAY_NUMBER}, {@link #COLUMN_SEASON_DISPLAY_NUMBER},
		* {@link #COLUMN_EPISODE_DISPLAY_NUMBER}, and {@link #COLUMN_EPISODE_TITLE}) are filled in.
		*
		* <p>Type: TEXT
		*/
		@@ -978,18 +979,64 @@ public final class TvContract {
		* <p>Can be empty.
		*
		* <p>Type: INTEGER
		*
		* @deprecated Use {@link #COLUMN_SEASON_DISPLAY_NUMBER} instead.
		*/
		@Deprecated
		public static final String COLUMN_SEASON_NUMBER = "season_number";

		/**
		* The season display number of this TV program for episodic TV shows.
		*
		* <p>This is used to indicate the season number. (e.g. 1, 2 or 3) Note that the value
		* does not necessarily be numeric. (e.g. 12B)
		*
		* <p>Can be empty.
		*
		* <p>Type: TEXT
		*/
		public static final String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_number";

		/**
		* The title of the season for this TV program for episodic TV shows.
		*
		* <p>This is an optional field supplied only when the season has a special title
		* (e.g. The Final Season). If provided, the applications should display it instead of
		* {@link #COLUMN_SEASON_DISPLAY_NUMBER}, and should display it without alterations.
		* (e.g. for "The Final Season", displayed string should be "The Final Season", not
		* "Season The Final Season"). When displaying multiple programs, the order should be based
		* on {@link #COLUMN_SEASON_DISPLAY_NUMBER}, even when {@link #COLUMN_SEASON_TITLE} exists.
		*
		* <p>Can be empty.
		*
		* <p>Type: TEXT
		*/
		public static final String COLUMN_SEASON_TITLE = "season_title";

		/**
		* The episode number of this TV program for episodic TV shows.
		*
		* <p>Can be empty.
		*
		* <p>Type: INTEGER
		*
		* @deprecated Use {@link #COLUMN_EPISODE_DISPLAY_NUMBER} instead.
		*/
		@Deprecated
		public static final String COLUMN_EPISODE_NUMBER = "episode_number";

		/**
		* The episode display number of this TV program for episodic TV shows.
		*
		* <p>This is used to indicate the episode number. (e.g. 1, 2 or 3) Note that the value
		* does not necessarily be numeric. (e.g. 12B)
		*
		* <p>Can be empty.
		*
		* <p>Type: TEXT
		*/
		public static final String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";

		/**
		* The episode title of this TV program for episodic TV shows.
		*
		@@ -1461,8 +1508,9 @@ public final class TvContract {
		* The title of this recorded TV program.
		*
		* <p>If this recorded program is an episodic TV show, it is recommended that the title is
		* the series title and its related fields ({@link #COLUMN_SEASON_NUMBER},
		* {@link #COLUMN_EPISODE_NUMBER}, and {@link #COLUMN_EPISODE_TITLE}) are filled in.
		* the series title and its related fields ({@link #COLUMN_SEASON_TITLE} and/or
		* {@link #COLUMN_SEASON_DISPLAY_NUMBER}, {@link #COLUMN_EPISODE_DISPLAY_NUMBER},
		* and {@link #COLUMN_EPISODE_TITLE}) are filled in.
		*
		* <p>Type: TEXT
		* @see Programs#COLUMN_TITLE
		@@ -1470,24 +1518,46 @@ public final class TvContract {
		public static final String COLUMN_TITLE = Programs.COLUMN_TITLE;

		/**
		* The season number of this recorded TV program for episodic TV shows.
		* The season display number of this recorded TV program for episodic TV shows.
		*
		* <p>This is used to indicate the season number. (e.g. 1, 2 or 3) Note that the value
		* does not necessarily be numeric. (e.g. 12B)
		*
		* <p>Can be empty.
		*
		* <p>Type: INTEGER
		* @see Programs#COLUMN_SEASON_NUMBER
		* <p>Type: TEXT
		*/
		public static final String COLUMN_SEASON_DISPLAY_NUMBER =
		Programs.COLUMN_SEASON_DISPLAY_NUMBER;

		/**
		* The title of the season for this recorded TV program for episodic TV shows.
		*
		* <p>This is an optional field supplied only when the season has a special title
		* (e.g. The Final Season). If provided, the applications should display it instead of
		* {@link #COLUMN_SEASON_DISPLAY_NUMBER} without alterations.
		* (e.g. for "The Final Season", displayed string should be "The Final Season", not
		* "Season The Final Season"). When displaying multiple programs, the order should be based
		* on {@link #COLUMN_SEASON_DISPLAY_NUMBER}, even when {@link #COLUMN_SEASON_TITLE} exists.
		*
		* <p>Can be empty.
		*
		* <p>Type: TEXT
		*/
		public static final String COLUMN_SEASON_NUMBER = Programs.COLUMN_SEASON_NUMBER;
		public static final String COLUMN_SEASON_TITLE = Programs.COLUMN_SEASON_TITLE;

		/**
		* The episode number of this recorded TV program for episodic TV shows.
		* The episode display number of this recorded TV program for episodic TV shows.
		*
		* <p>This is used to indicate the episode number. (e.g. 1, 2 or 3) Note that the value
		* does not necessarily be numeric. (e.g. 12B)
		*
		* <p>Can be empty.
		*
		* <p>Type: INTEGER
		* @see Programs#COLUMN_EPISODE_NUMBER
		* <p>Type: TEXT
		*/
		public static final String COLUMN_EPISODE_NUMBER = Programs.COLUMN_EPISODE_NUMBER;
		public static final String COLUMN_EPISODE_DISPLAY_NUMBER =
		Programs.COLUMN_EPISODE_DISPLAY_NUMBER;

		/**
		* The episode title of this recorded TV program for episodic TV shows.