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

Commit 2566af67 authored by Dongwon Kang's avatar Dongwon Kang
Browse files

TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms 

Test: build
Bug: 37288064
Change-Id: I4750547a2550ef058c5fbdeca344fe5a94fc3fc9
parent 076a0bd0

api/current.txt

+6 −4
Original line number Diff line number Diff line
@@ -24623,9 +24623,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










@@ -24808,9 +24809,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








@@ -26606,9 +26606,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










@@ -26791,9 +26792,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








@@ -24730,9 +24730,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










@@ -24915,9 +24916,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








@@ -1068,6 +1068,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 {}









@@ -1088,13 +1089,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.









@@ -1102,7 +1111,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({










@@ -1227,6 +1236,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}.















         *









@@ -1240,6 +1250,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}.















         *