Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev (0cdc7c88) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −4

Original line number	Diff line number	Diff line
		@@ -24611,9 +24611,10 @@ package android.media.tv {

		public static final class TvContract.PreviewPrograms implements android.media.tv.TvContract.BaseTvColumns {
		field public static final int ASPECT_RATIO_16_9 = 0; // 0x0
		field public static final int ASPECT_RATIO_1_1 = 2; // 0x2
		field public static final int ASPECT_RATIO_2_3 = 3; // 0x3
		field public static final int ASPECT_RATIO_1_1 = 3; // 0x3
		field public static final int ASPECT_RATIO_2_3 = 4; // 0x4
		field public static final int ASPECT_RATIO_3_2 = 1; // 0x1
		field public static final int ASPECT_RATIO_4_3 = 2; // 0x2
		field public static final int AVAILABILITY_AVAILABLE = 0; // 0x0
		field public static final int AVAILABILITY_FREE_WITH_SUBSCRIPTION = 1; // 0x1
		field public static final int AVAILABILITY_PAID_CONTENT = 2; // 0x2
		@@ -24796,9 +24797,10 @@ package android.media.tv {
		public static final class TvContract.WatchNextPrograms implements android.media.tv.TvContract.BaseTvColumns {
		ctor public TvContract.WatchNextPrograms();
		field public static final int ASPECT_RATIO_16_9 = 0; // 0x0
		field public static final int ASPECT_RATIO_1_1 = 2; // 0x2
		field public static final int ASPECT_RATIO_2_3 = 3; // 0x3
		field public static final int ASPECT_RATIO_1_1 = 3; // 0x3
		field public static final int ASPECT_RATIO_2_3 = 4; // 0x4
		field public static final int ASPECT_RATIO_3_2 = 1; // 0x1
		field public static final int ASPECT_RATIO_4_3 = 2; // 0x2
		field public static final int AVAILABILITY_AVAILABLE = 0; // 0x0
		field public static final int AVAILABILITY_FREE_WITH_SUBSCRIPTION = 1; // 0x1
		field public static final int AVAILABILITY_PAID_CONTENT = 2; // 0x2

api/system-current.txt

+6 −4

Original line number	Diff line number	Diff line
		@@ -26604,9 +26604,10 @@ package android.media.tv {

		public static final class TvContract.PreviewPrograms implements android.media.tv.TvContract.BaseTvColumns {
		field public static final int ASPECT_RATIO_16_9 = 0; // 0x0
		field public static final int ASPECT_RATIO_1_1 = 2; // 0x2
		field public static final int ASPECT_RATIO_2_3 = 3; // 0x3
		field public static final int ASPECT_RATIO_1_1 = 3; // 0x3
		field public static final int ASPECT_RATIO_2_3 = 4; // 0x4
		field public static final int ASPECT_RATIO_3_2 = 1; // 0x1
		field public static final int ASPECT_RATIO_4_3 = 2; // 0x2
		field public static final int AVAILABILITY_AVAILABLE = 0; // 0x0
		field public static final int AVAILABILITY_FREE_WITH_SUBSCRIPTION = 1; // 0x1
		field public static final int AVAILABILITY_PAID_CONTENT = 2; // 0x2
		@@ -26789,9 +26790,10 @@ package android.media.tv {
		public static final class TvContract.WatchNextPrograms implements android.media.tv.TvContract.BaseTvColumns {
		ctor public TvContract.WatchNextPrograms();
		field public static final int ASPECT_RATIO_16_9 = 0; // 0x0
		field public static final int ASPECT_RATIO_1_1 = 2; // 0x2
		field public static final int ASPECT_RATIO_2_3 = 3; // 0x3
		field public static final int ASPECT_RATIO_1_1 = 3; // 0x3
		field public static final int ASPECT_RATIO_2_3 = 4; // 0x4
		field public static final int ASPECT_RATIO_3_2 = 1; // 0x1
		field public static final int ASPECT_RATIO_4_3 = 2; // 0x2
		field public static final int AVAILABILITY_AVAILABLE = 0; // 0x0
		field public static final int AVAILABILITY_FREE_WITH_SUBSCRIPTION = 1; // 0x1
		field public static final int AVAILABILITY_PAID_CONTENT = 2; // 0x2

api/test-current.txt

+6 −4

Original line number	Diff line number	Diff line
		@@ -24718,9 +24718,10 @@ package android.media.tv {

		public static final class TvContract.PreviewPrograms implements android.media.tv.TvContract.BaseTvColumns {
		field public static final int ASPECT_RATIO_16_9 = 0; // 0x0
		field public static final int ASPECT_RATIO_1_1 = 2; // 0x2
		field public static final int ASPECT_RATIO_2_3 = 3; // 0x3
		field public static final int ASPECT_RATIO_1_1 = 3; // 0x3
		field public static final int ASPECT_RATIO_2_3 = 4; // 0x4
		field public static final int ASPECT_RATIO_3_2 = 1; // 0x1
		field public static final int ASPECT_RATIO_4_3 = 2; // 0x2
		field public static final int AVAILABILITY_AVAILABLE = 0; // 0x0
		field public static final int AVAILABILITY_FREE_WITH_SUBSCRIPTION = 1; // 0x1
		field public static final int AVAILABILITY_PAID_CONTENT = 2; // 0x2
		@@ -24903,9 +24904,10 @@ package android.media.tv {
		public static final class TvContract.WatchNextPrograms implements android.media.tv.TvContract.BaseTvColumns {
		ctor public TvContract.WatchNextPrograms();
		field public static final int ASPECT_RATIO_16_9 = 0; // 0x0
		field public static final int ASPECT_RATIO_1_1 = 2; // 0x2
		field public static final int ASPECT_RATIO_2_3 = 3; // 0x3
		field public static final int ASPECT_RATIO_1_1 = 3; // 0x3
		field public static final int ASPECT_RATIO_2_3 = 4; // 0x4
		field public static final int ASPECT_RATIO_3_2 = 1; // 0x1
		field public static final int ASPECT_RATIO_4_3 = 2; // 0x2
		field public static final int AVAILABILITY_AVAILABLE = 0; // 0x0
		field public static final int AVAILABILITY_FREE_WITH_SUBSCRIPTION = 1; // 0x1
		field public static final int AVAILABILITY_PAID_CONTENT = 2; // 0x2

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

+13 −2

Original line number	Diff line number	Diff line
		@@ -1182,6 +1182,7 @@ public final class TvContract {
		ASPECT_RATIO_3_2,
		ASPECT_RATIO_1_1,
		ASPECT_RATIO_2_3,
		ASPECT_RATIO_4_3,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface AspectRatio {}
		@@ -1202,13 +1203,21 @@ public final class TvContract {
		*/
		int ASPECT_RATIO_3_2 = 1;

		/**
		* The aspect ratio for 4:3.
		*
		* @see #COLUMN_POSTER_ART_ASPECT_RATIO
		* @see #COLUMN_THUMBNAIL_ASPECT_RATIO
		*/
		int ASPECT_RATIO_4_3 = 2;

		/**
		* The aspect ratio for 1:1.
		*
		* @see #COLUMN_POSTER_ART_ASPECT_RATIO
		* @see #COLUMN_THUMBNAIL_ASPECT_RATIO
		*/
		int ASPECT_RATIO_1_1 = 2;
		int ASPECT_RATIO_1_1 = 3;

		/**
		* The aspect ratio for 2:3.
		@@ -1216,7 +1225,7 @@ public final class TvContract {
		* @see #COLUMN_POSTER_ART_ASPECT_RATIO
		* @see #COLUMN_THUMBNAIL_ASPECT_RATIO
		*/
		int ASPECT_RATIO_2_3 = 3;
		int ASPECT_RATIO_2_3 = 4;

		/** @hide */
		@IntDef({
		@@ -1341,6 +1350,7 @@ public final class TvContract {
		* <p>The value should match one of the followings:
		* {@link #ASPECT_RATIO_16_9},
		* {@link #ASPECT_RATIO_3_2},
		* {@link #ASPECT_RATIO_4_3},
		* {@link #ASPECT_RATIO_1_1}, and
		* {@link #ASPECT_RATIO_2_3}.
		*
		@@ -1354,6 +1364,7 @@ public final class TvContract {
		* <p>The value should match one of the followings:
		* {@link #ASPECT_RATIO_16_9},
		* {@link #ASPECT_RATIO_3_2},
		* {@link #ASPECT_RATIO_4_3},
		* {@link #ASPECT_RATIO_1_1}, and
		* {@link #ASPECT_RATIO_2_3}.
		*