drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TIF: use integer for constants instead of string" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-04 01:10:39 +00:00
committed by Android (Google) Code Review
parent df9cf5450c f9bbac1daf
commit b43a5305bd
4 changed files with 155 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
api/current.txt
View File

@ -24542,13 +24542,13 @@ package android.media.tv {
} }
public static abstract interface TvContract.BasePreviewProgramColumns implements android.media.tv.TvContract.BaseProgramColumns { public static abstract interface TvContract.BasePreviewProgramColumns 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 int ASPECT_RATIO_16_9 = 0; // 0x0
field public static final java.lang.String ASPECT_RATIO_1_1 = "ASPECT_RATIO_1_1"; field public static final int ASPECT_RATIO_1_1 = 2; // 0x2
field public static final java.lang.String ASPECT_RATIO_2_3 = "ASPECT_RATIO_2_3"; field public static final int ASPECT_RATIO_2_3 = 3; // 0x3
field public static final java.lang.String ASPECT_RATIO_3_2 = "ASPECT_RATIO_3_2"; field public static final int ASPECT_RATIO_3_2 = 1; // 0x1
field public static final java.lang.String AVAILABILITY_AVAILABLE = "AVAILABILITY_AVAILABLE"; field public static final int AVAILABILITY_AVAILABLE = 0; // 0x0
field public static final java.lang.String AVAILABILITY_FREE_WITH_SUBSCRIPTION = "AVAILABILITY_FREE_WITH_SUBSCRIPTION"; field public static final int AVAILABILITY_FREE_WITH_SUBSCRIPTION = 1; // 0x1
field public static final java.lang.String AVAILABILITY_PAID_CONTENT = "AVAILABILITY_PAID_CONTENT"; field public static final int AVAILABILITY_PAID_CONTENT = 2; // 0x2
field public static final java.lang.String COLUMN_AUTHOR = "author"; 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_AVAILABILITY = "availability";
field public static final java.lang.String COLUMN_BROWSABLE = "browsable"; field public static final java.lang.String COLUMN_BROWSABLE = "browsable";
@ -24572,28 +24572,28 @@ package android.media.tv {
field public static final java.lang.String COLUMN_THUMBNAIL_ASPECT_RATIO = "poster_thumbnail_aspect_ratio"; 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_TRANSIENT = "transient";
field public static final java.lang.String COLUMN_TYPE = "type"; field public static final java.lang.String COLUMN_TYPE = "type";
field public static final java.lang.String INTERACTION_TYPE_FANS = "INTERACTION_TYPE_FANS"; field public static final int INTERACTION_TYPE_FANS = 3; // 0x3
field public static final java.lang.String INTERACTION_TYPE_FOLLOWERS = "INTERACTION_TYPE_FOLLOWERS"; field public static final int INTERACTION_TYPE_FOLLOWERS = 2; // 0x2
field public static final java.lang.String INTERACTION_TYPE_LIKES = "INTERACTION_TYPE_LIKES"; field public static final int INTERACTION_TYPE_LIKES = 4; // 0x4
field public static final java.lang.String INTERACTION_TYPE_LISTENS = "INTERACTION_TYPE_LISTENS"; field public static final int INTERACTION_TYPE_LISTENS = 1; // 0x1
field public static final java.lang.String INTERACTION_TYPE_THUMBS = "INTERACTION_TYPE_THUMBS"; field public static final int INTERACTION_TYPE_THUMBS = 5; // 0x5
field public static final java.lang.String INTERACTION_TYPE_VIEWERS = "INTERACTION_TYPE_VIEWERS"; field public static final int INTERACTION_TYPE_VIEWERS = 6; // 0x6
field public static final java.lang.String INTERACTION_TYPE_VIEWS = "INTERACTION_TYPE_VIEWS"; field public static final int INTERACTION_TYPE_VIEWS = 0; // 0x0
field public static final java.lang.String REVIEW_RATING_STYLE_PERCENTAGE = "REVIEW_RATING_STYLE_PERCENTAGE"; field public static final int REVIEW_RATING_STYLE_PERCENTAGE = 2; // 0x2
field public static final java.lang.String REVIEW_RATING_STYLE_STARS = "REVIEW_RATING_STYLE_STARS"; field public static final int REVIEW_RATING_STYLE_STARS = 0; // 0x0
field public static final java.lang.String REVIEW_RATING_STYLE_THUMBS_UP_DOWN = "REVIEW_RATING_STYLE_THUMBS_UP_DOWN"; field public static final int REVIEW_RATING_STYLE_THUMBS_UP_DOWN = 1; // 0x1
field public static final java.lang.String TYPE_ALBUM = "TYPE_ALBUM"; field public static final int TYPE_ALBUM = 8; // 0x8
field public static final java.lang.String TYPE_ARTIST = "TYPE_ARTIST"; field public static final int TYPE_ARTIST = 9; // 0x9
field public static final java.lang.String TYPE_CHANNEL = "TYPE_CHANNEL"; field public static final int TYPE_CHANNEL = 6; // 0x6
field public static final java.lang.String TYPE_CLIP = "TYPE_CLIP"; field public static final int TYPE_CLIP = 4; // 0x4
field public static final java.lang.String TYPE_EVENT = "TYPE_EVENT"; field public static final int TYPE_EVENT = 5; // 0x5
field public static final java.lang.String TYPE_MOVIE = "TYPE_MOVIE"; field public static final int TYPE_MOVIE = 0; // 0x0
field public static final java.lang.String TYPE_PLAYLIST = "TYPE_PLAYLIST"; field public static final int TYPE_PLAYLIST = 10; // 0xa
field public static final java.lang.String TYPE_STATION = "TYPE_STATION"; field public static final int TYPE_STATION = 11; // 0xb
field public static final java.lang.String TYPE_TRACK = "TYPE_TRACK"; field public static final int TYPE_TRACK = 7; // 0x7
field public static final java.lang.String TYPE_TV_EPISODE = "TYPE_TV_EPISODE"; field public static final int TYPE_TV_EPISODE = 3; // 0x3
field public static final java.lang.String TYPE_TV_SEASON = "TYPE_TV_SEASON"; field public static final int TYPE_TV_SEASON = 2; // 0x2
field public static final java.lang.String TYPE_TV_SERIES = "TYPE_TV_SERIES"; field public static final int TYPE_TV_SERIES = 1; // 0x1
} }
public static abstract interface TvContract.BaseProgramColumns implements android.media.tv.TvContract.BaseTvColumns { public static abstract interface TvContract.BaseProgramColumns implements android.media.tv.TvContract.BaseTvColumns {
@ -24772,10 +24772,10 @@ package android.media.tv {
field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/watch_next_program"; field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/watch_next_program";
field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/watch_next_program"; field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/watch_next_program";
field public static final android.net.Uri CONTENT_URI; field public static final android.net.Uri CONTENT_URI;
field public static final java.lang.String WATCH_NEXT_TYPE_CONTINUE = "WATCH_NEXT_TYPE_CONTINUE"; field public static final int WATCH_NEXT_TYPE_CONTINUE = 0; // 0x0
field public static final java.lang.String WATCH_NEXT_TYPE_NEW = "WATCH_NEXT_TYPE_NEW"; field public static final int WATCH_NEXT_TYPE_NEW = 2; // 0x2
field public static final java.lang.String WATCH_NEXT_TYPE_NEXT = "WATCH_NEXT_TYPE_NEXT"; field public static final int WATCH_NEXT_TYPE_NEXT = 1; // 0x1
field public static final java.lang.String WATCH_NEXT_TYPE_WATCHLIST = "WATCH_NEXT_TYPE_WATCHLIST"; field public static final int WATCH_NEXT_TYPE_WATCHLIST = 3; // 0x3
} }
public final class TvInputInfo implements android.os.Parcelable { public final class TvInputInfo implements android.os.Parcelable {

66
api/system-current.txt
View File

@ -26483,13 +26483,13 @@ package android.media.tv {
} }
public static abstract interface TvContract.BasePreviewProgramColumns implements android.media.tv.TvContract.BaseProgramColumns { public static abstract interface TvContract.BasePreviewProgramColumns 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 int ASPECT_RATIO_16_9 = 0; // 0x0
field public static final java.lang.String ASPECT_RATIO_1_1 = "ASPECT_RATIO_1_1"; field public static final int ASPECT_RATIO_1_1 = 2; // 0x2
field public static final java.lang.String ASPECT_RATIO_2_3 = "ASPECT_RATIO_2_3"; field public static final int ASPECT_RATIO_2_3 = 3; // 0x3
field public static final java.lang.String ASPECT_RATIO_3_2 = "ASPECT_RATIO_3_2"; field public static final int ASPECT_RATIO_3_2 = 1; // 0x1
field public static final java.lang.String AVAILABILITY_AVAILABLE = "AVAILABILITY_AVAILABLE"; field public static final int AVAILABILITY_AVAILABLE = 0; // 0x0
field public static final java.lang.String AVAILABILITY_FREE_WITH_SUBSCRIPTION = "AVAILABILITY_FREE_WITH_SUBSCRIPTION"; field public static final int AVAILABILITY_FREE_WITH_SUBSCRIPTION = 1; // 0x1
field public static final java.lang.String AVAILABILITY_PAID_CONTENT = "AVAILABILITY_PAID_CONTENT"; field public static final int AVAILABILITY_PAID_CONTENT = 2; // 0x2
field public static final java.lang.String COLUMN_AUTHOR = "author"; 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_AVAILABILITY = "availability";
field public static final java.lang.String COLUMN_BROWSABLE = "browsable"; field public static final java.lang.String COLUMN_BROWSABLE = "browsable";
@ -26513,28 +26513,28 @@ package android.media.tv {
field public static final java.lang.String COLUMN_THUMBNAIL_ASPECT_RATIO = "poster_thumbnail_aspect_ratio"; 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_TRANSIENT = "transient";
field public static final java.lang.String COLUMN_TYPE = "type"; field public static final java.lang.String COLUMN_TYPE = "type";
field public static final java.lang.String INTERACTION_TYPE_FANS = "INTERACTION_TYPE_FANS"; field public static final int INTERACTION_TYPE_FANS = 3; // 0x3
field public static final java.lang.String INTERACTION_TYPE_FOLLOWERS = "INTERACTION_TYPE_FOLLOWERS"; field public static final int INTERACTION_TYPE_FOLLOWERS = 2; // 0x2
field public static final java.lang.String INTERACTION_TYPE_LIKES = "INTERACTION_TYPE_LIKES"; field public static final int INTERACTION_TYPE_LIKES = 4; // 0x4
field public static final java.lang.String INTERACTION_TYPE_LISTENS = "INTERACTION_TYPE_LISTENS"; field public static final int INTERACTION_TYPE_LISTENS = 1; // 0x1
field public static final java.lang.String INTERACTION_TYPE_THUMBS = "INTERACTION_TYPE_THUMBS"; field public static final int INTERACTION_TYPE_THUMBS = 5; // 0x5
field public static final java.lang.String INTERACTION_TYPE_VIEWERS = "INTERACTION_TYPE_VIEWERS"; field public static final int INTERACTION_TYPE_VIEWERS = 6; // 0x6
field public static final java.lang.String INTERACTION_TYPE_VIEWS = "INTERACTION_TYPE_VIEWS"; field public static final int INTERACTION_TYPE_VIEWS = 0; // 0x0
field public static final java.lang.String REVIEW_RATING_STYLE_PERCENTAGE = "REVIEW_RATING_STYLE_PERCENTAGE"; field public static final int REVIEW_RATING_STYLE_PERCENTAGE = 2; // 0x2
field public static final java.lang.String REVIEW_RATING_STYLE_STARS = "REVIEW_RATING_STYLE_STARS"; field public static final int REVIEW_RATING_STYLE_STARS = 0; // 0x0
field public static final java.lang.String REVIEW_RATING_STYLE_THUMBS_UP_DOWN = "REVIEW_RATING_STYLE_THUMBS_UP_DOWN"; field public static final int REVIEW_RATING_STYLE_THUMBS_UP_DOWN = 1; // 0x1
field public static final java.lang.String TYPE_ALBUM = "TYPE_ALBUM"; field public static final int TYPE_ALBUM = 8; // 0x8
field public static final java.lang.String TYPE_ARTIST = "TYPE_ARTIST"; field public static final int TYPE_ARTIST = 9; // 0x9
field public static final java.lang.String TYPE_CHANNEL = "TYPE_CHANNEL"; field public static final int TYPE_CHANNEL = 6; // 0x6
field public static final java.lang.String TYPE_CLIP = "TYPE_CLIP"; field public static final int TYPE_CLIP = 4; // 0x4
field public static final java.lang.String TYPE_EVENT = "TYPE_EVENT"; field public static final int TYPE_EVENT = 5; // 0x5
field public static final java.lang.String TYPE_MOVIE = "TYPE_MOVIE"; field public static final int TYPE_MOVIE = 0; // 0x0
field public static final java.lang.String TYPE_PLAYLIST = "TYPE_PLAYLIST"; field public static final int TYPE_PLAYLIST = 10; // 0xa
field public static final java.lang.String TYPE_STATION = "TYPE_STATION"; field public static final int TYPE_STATION = 11; // 0xb
field public static final java.lang.String TYPE_TRACK = "TYPE_TRACK"; field public static final int TYPE_TRACK = 7; // 0x7
field public static final java.lang.String TYPE_TV_EPISODE = "TYPE_TV_EPISODE"; field public static final int TYPE_TV_EPISODE = 3; // 0x3
field public static final java.lang.String TYPE_TV_SEASON = "TYPE_TV_SEASON"; field public static final int TYPE_TV_SEASON = 2; // 0x2
field public static final java.lang.String TYPE_TV_SERIES = "TYPE_TV_SERIES"; field public static final int TYPE_TV_SERIES = 1; // 0x1
} }
public static abstract interface TvContract.BaseProgramColumns implements android.media.tv.TvContract.BaseTvColumns { public static abstract interface TvContract.BaseProgramColumns implements android.media.tv.TvContract.BaseTvColumns {
@ -26714,10 +26714,10 @@ package android.media.tv {
field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/watch_next_program"; field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/watch_next_program";
field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/watch_next_program"; field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/watch_next_program";
field public static final android.net.Uri CONTENT_URI; field public static final android.net.Uri CONTENT_URI;
field public static final java.lang.String WATCH_NEXT_TYPE_CONTINUE = "WATCH_NEXT_TYPE_CONTINUE"; field public static final int WATCH_NEXT_TYPE_CONTINUE = 0; // 0x0
field public static final java.lang.String WATCH_NEXT_TYPE_NEW = "WATCH_NEXT_TYPE_NEW"; field public static final int WATCH_NEXT_TYPE_NEW = 2; // 0x2
field public static final java.lang.String WATCH_NEXT_TYPE_NEXT = "WATCH_NEXT_TYPE_NEXT"; field public static final int WATCH_NEXT_TYPE_NEXT = 1; // 0x1
field public static final java.lang.String WATCH_NEXT_TYPE_WATCHLIST = "WATCH_NEXT_TYPE_WATCHLIST"; field public static final int WATCH_NEXT_TYPE_WATCHLIST = 3; // 0x3
} }
public static final class TvContract.WatchedPrograms implements android.media.tv.TvContract.BaseTvColumns { public static final class TvContract.WatchedPrograms implements android.media.tv.TvContract.BaseTvColumns {

66
api/test-current.txt
View File

@ -24655,13 +24655,13 @@ package android.media.tv {
} }
public static abstract interface TvContract.BasePreviewProgramColumns implements android.media.tv.TvContract.BaseProgramColumns { public static abstract interface TvContract.BasePreviewProgramColumns 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 int ASPECT_RATIO_16_9 = 0; // 0x0
field public static final java.lang.String ASPECT_RATIO_1_1 = "ASPECT_RATIO_1_1"; field public static final int ASPECT_RATIO_1_1 = 2; // 0x2
field public static final java.lang.String ASPECT_RATIO_2_3 = "ASPECT_RATIO_2_3"; field public static final int ASPECT_RATIO_2_3 = 3; // 0x3
field public static final java.lang.String ASPECT_RATIO_3_2 = "ASPECT_RATIO_3_2"; field public static final int ASPECT_RATIO_3_2 = 1; // 0x1
field public static final java.lang.String AVAILABILITY_AVAILABLE = "AVAILABILITY_AVAILABLE"; field public static final int AVAILABILITY_AVAILABLE = 0; // 0x0
field public static final java.lang.String AVAILABILITY_FREE_WITH_SUBSCRIPTION = "AVAILABILITY_FREE_WITH_SUBSCRIPTION"; field public static final int AVAILABILITY_FREE_WITH_SUBSCRIPTION = 1; // 0x1
field public static final java.lang.String AVAILABILITY_PAID_CONTENT = "AVAILABILITY_PAID_CONTENT"; field public static final int AVAILABILITY_PAID_CONTENT = 2; // 0x2
field public static final java.lang.String COLUMN_AUTHOR = "author"; 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_AVAILABILITY = "availability";
field public static final java.lang.String COLUMN_BROWSABLE = "browsable"; field public static final java.lang.String COLUMN_BROWSABLE = "browsable";
@ -24685,28 +24685,28 @@ package android.media.tv {
field public static final java.lang.String COLUMN_THUMBNAIL_ASPECT_RATIO = "poster_thumbnail_aspect_ratio"; 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_TRANSIENT = "transient";
field public static final java.lang.String COLUMN_TYPE = "type"; field public static final java.lang.String COLUMN_TYPE = "type";
field public static final java.lang.String INTERACTION_TYPE_FANS = "INTERACTION_TYPE_FANS"; field public static final int INTERACTION_TYPE_FANS = 3; // 0x3
field public static final java.lang.String INTERACTION_TYPE_FOLLOWERS = "INTERACTION_TYPE_FOLLOWERS"; field public static final int INTERACTION_TYPE_FOLLOWERS = 2; // 0x2
field public static final java.lang.String INTERACTION_TYPE_LIKES = "INTERACTION_TYPE_LIKES"; field public static final int INTERACTION_TYPE_LIKES = 4; // 0x4
field public static final java.lang.String INTERACTION_TYPE_LISTENS = "INTERACTION_TYPE_LISTENS"; field public static final int INTERACTION_TYPE_LISTENS = 1; // 0x1
field public static final java.lang.String INTERACTION_TYPE_THUMBS = "INTERACTION_TYPE_THUMBS"; field public static final int INTERACTION_TYPE_THUMBS = 5; // 0x5
field public static final java.lang.String INTERACTION_TYPE_VIEWERS = "INTERACTION_TYPE_VIEWERS"; field public static final int INTERACTION_TYPE_VIEWERS = 6; // 0x6
field public static final java.lang.String INTERACTION_TYPE_VIEWS = "INTERACTION_TYPE_VIEWS"; field public static final int INTERACTION_TYPE_VIEWS = 0; // 0x0
field public static final java.lang.String REVIEW_RATING_STYLE_PERCENTAGE = "REVIEW_RATING_STYLE_PERCENTAGE"; field public static final int REVIEW_RATING_STYLE_PERCENTAGE = 2; // 0x2
field public static final java.lang.String REVIEW_RATING_STYLE_STARS = "REVIEW_RATING_STYLE_STARS"; field public static final int REVIEW_RATING_STYLE_STARS = 0; // 0x0
field public static final java.lang.String REVIEW_RATING_STYLE_THUMBS_UP_DOWN = "REVIEW_RATING_STYLE_THUMBS_UP_DOWN"; field public static final int REVIEW_RATING_STYLE_THUMBS_UP_DOWN = 1; // 0x1
field public static final java.lang.String TYPE_ALBUM = "TYPE_ALBUM"; field public static final int TYPE_ALBUM = 8; // 0x8
field public static final java.lang.String TYPE_ARTIST = "TYPE_ARTIST"; field public static final int TYPE_ARTIST = 9; // 0x9
field public static final java.lang.String TYPE_CHANNEL = "TYPE_CHANNEL"; field public static final int TYPE_CHANNEL = 6; // 0x6
field public static final java.lang.String TYPE_CLIP = "TYPE_CLIP"; field public static final int TYPE_CLIP = 4; // 0x4
field public static final java.lang.String TYPE_EVENT = "TYPE_EVENT"; field public static final int TYPE_EVENT = 5; // 0x5
field public static final java.lang.String TYPE_MOVIE = "TYPE_MOVIE"; field public static final int TYPE_MOVIE = 0; // 0x0
field public static final java.lang.String TYPE_PLAYLIST = "TYPE_PLAYLIST"; field public static final int TYPE_PLAYLIST = 10; // 0xa
field public static final java.lang.String TYPE_STATION = "TYPE_STATION"; field public static final int TYPE_STATION = 11; // 0xb
field public static final java.lang.String TYPE_TRACK = "TYPE_TRACK"; field public static final int TYPE_TRACK = 7; // 0x7
field public static final java.lang.String TYPE_TV_EPISODE = "TYPE_TV_EPISODE"; field public static final int TYPE_TV_EPISODE = 3; // 0x3
field public static final java.lang.String TYPE_TV_SEASON = "TYPE_TV_SEASON"; field public static final int TYPE_TV_SEASON = 2; // 0x2
field public static final java.lang.String TYPE_TV_SERIES = "TYPE_TV_SERIES"; field public static final int TYPE_TV_SERIES = 1; // 0x1
} }
public static abstract interface TvContract.BaseProgramColumns implements android.media.tv.TvContract.BaseTvColumns { public static abstract interface TvContract.BaseProgramColumns implements android.media.tv.TvContract.BaseTvColumns {
@ -24885,10 +24885,10 @@ package android.media.tv {
field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/watch_next_program"; field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/watch_next_program";
field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/watch_next_program"; field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/watch_next_program";
field public static final android.net.Uri CONTENT_URI; field public static final android.net.Uri CONTENT_URI;
field public static final java.lang.String WATCH_NEXT_TYPE_CONTINUE = "WATCH_NEXT_TYPE_CONTINUE"; field public static final int WATCH_NEXT_TYPE_CONTINUE = 0; // 0x0
field public static final java.lang.String WATCH_NEXT_TYPE_NEW = "WATCH_NEXT_TYPE_NEW"; field public static final int WATCH_NEXT_TYPE_NEW = 2; // 0x2
field public static final java.lang.String WATCH_NEXT_TYPE_NEXT = "WATCH_NEXT_TYPE_NEXT"; field public static final int WATCH_NEXT_TYPE_NEXT = 1; // 0x1
field public static final java.lang.String WATCH_NEXT_TYPE_WATCHLIST = "WATCH_NEXT_TYPE_WATCHLIST"; field public static final int WATCH_NEXT_TYPE_WATCHLIST = 3; // 0x3
} }
public final class TvInputInfo implements android.os.Parcelable { public final class TvInputInfo implements android.os.Parcelable {

114
media/java/android/media/tv/TvContract.java
View File

@ -16,6 +16,7 @@
package android.media.tv; package android.media.tv;
import android.annotation.IntDef;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.StringDef; import android.annotation.StringDef;
@ -840,7 +841,7 @@ public final class TvContract {
public interface BasePreviewProgramColumns extends BaseProgramColumns { public interface BasePreviewProgramColumns extends BaseProgramColumns {
/** @hide */ /** @hide */
@StringDef({ @IntDef({
TYPE_MOVIE, TYPE_MOVIE,
TYPE_TV_SERIES, TYPE_TV_SERIES,
TYPE_TV_SEASON, TYPE_TV_SEASON,
@ -862,87 +863,87 @@ public final class TvContract {
* *
* @see #COLUMN_TYPE * @see #COLUMN_TYPE
*/ */
String TYPE_MOVIE = "TYPE_MOVIE"; int TYPE_MOVIE = 0;
/** /**
* The program type for TV series. * The program type for TV series.
* *
* @see #COLUMN_TYPE * @see #COLUMN_TYPE
*/ */
String TYPE_TV_SERIES = "TYPE_TV_SERIES"; int TYPE_TV_SERIES = 1;
/** /**
* The program type for TV season. * The program type for TV season.
* *
* @see #COLUMN_TYPE * @see #COLUMN_TYPE
*/ */
String TYPE_TV_SEASON = "TYPE_TV_SEASON"; int TYPE_TV_SEASON = 2;
/** /**
* The program type for TV episode. * The program type for TV episode.
* *
* @see #COLUMN_TYPE * @see #COLUMN_TYPE
*/ */
String TYPE_TV_EPISODE = "TYPE_TV_EPISODE"; int TYPE_TV_EPISODE = 3;
/** /**
* The program type for clip. * The program type for clip.
* *
* @see #COLUMN_TYPE * @see #COLUMN_TYPE
*/ */
String TYPE_CLIP = "TYPE_CLIP"; int TYPE_CLIP = 4;
/** /**
* The program type for event. * The program type for event.
* *
* @see #COLUMN_TYPE * @see #COLUMN_TYPE
*/ */
String TYPE_EVENT = "TYPE_EVENT"; int TYPE_EVENT = 5;
/** /**
* The program type for channel. * The program type for channel.
* *
* @see #COLUMN_TYPE * @see #COLUMN_TYPE
*/ */
String TYPE_CHANNEL = "TYPE_CHANNEL"; int TYPE_CHANNEL = 6;
/** /**
* The program type for track. * The program type for track.
* *
* @see #COLUMN_TYPE * @see #COLUMN_TYPE
*/ */
String TYPE_TRACK = "TYPE_TRACK"; int TYPE_TRACK = 7;
/** /**
* The program type for album. * The program type for album.
* *
* @see #COLUMN_TYPE * @see #COLUMN_TYPE
*/ */
String TYPE_ALBUM = "TYPE_ALBUM"; int TYPE_ALBUM = 8;
/** /**
* The program type for artist. * The program type for artist.
* *
* @see #COLUMN_TYPE * @see #COLUMN_TYPE
*/ */
String TYPE_ARTIST = "TYPE_ARTIST"; int TYPE_ARTIST = 9;
/** /**
* The program type for playlist. * The program type for playlist.
* *
* @see #COLUMN_TYPE * @see #COLUMN_TYPE
*/ */
String TYPE_PLAYLIST = "TYPE_PLAYLIST"; int TYPE_PLAYLIST = 10;
/** /**
* The program type for station. * The program type for station.
* *
* @see #COLUMN_TYPE * @see #COLUMN_TYPE
*/ */
String TYPE_STATION = "TYPE_STATION"; int TYPE_STATION = 11;
/** @hide */ /** @hide */
@StringDef({ @IntDef({
ASPECT_RATIO_16_9, ASPECT_RATIO_16_9,
ASPECT_RATIO_3_2, ASPECT_RATIO_3_2,
ASPECT_RATIO_1_1, ASPECT_RATIO_1_1,
@ -957,7 +958,7 @@ public final class TvContract {
* @see #COLUMN_POSTER_ART_ASPECT_RATIO * @see #COLUMN_POSTER_ART_ASPECT_RATIO
* @see #COLUMN_THUMBNAIL_ASPECT_RATIO * @see #COLUMN_THUMBNAIL_ASPECT_RATIO
*/ */
String ASPECT_RATIO_16_9 = "ASPECT_RATIO_16_9"; int ASPECT_RATIO_16_9 = 0;
/** /**
* The aspect ratio for 3:2. * The aspect ratio for 3:2.
@ -965,7 +966,7 @@ public final class TvContract {
* @see #COLUMN_POSTER_ART_ASPECT_RATIO * @see #COLUMN_POSTER_ART_ASPECT_RATIO
* @see #COLUMN_THUMBNAIL_ASPECT_RATIO * @see #COLUMN_THUMBNAIL_ASPECT_RATIO
*/ */
String ASPECT_RATIO_3_2 = "ASPECT_RATIO_3_2"; int ASPECT_RATIO_3_2 = 1;
/** /**
* The aspect ratio for 1:1. * The aspect ratio for 1:1.
@ -973,7 +974,7 @@ public final class TvContract {
* @see #COLUMN_POSTER_ART_ASPECT_RATIO * @see #COLUMN_POSTER_ART_ASPECT_RATIO
* @see #COLUMN_THUMBNAIL_ASPECT_RATIO * @see #COLUMN_THUMBNAIL_ASPECT_RATIO
*/ */
String ASPECT_RATIO_1_1 = "ASPECT_RATIO_1_1"; int ASPECT_RATIO_1_1 = 2;
/** /**
* The aspect ratio for 2:3. * The aspect ratio for 2:3.
@ -981,10 +982,10 @@ public final class TvContract {
* @see #COLUMN_POSTER_ART_ASPECT_RATIO * @see #COLUMN_POSTER_ART_ASPECT_RATIO
* @see #COLUMN_THUMBNAIL_ASPECT_RATIO * @see #COLUMN_THUMBNAIL_ASPECT_RATIO
*/ */
String ASPECT_RATIO_2_3 = "ASPECT_RATIO_2_3"; int ASPECT_RATIO_2_3 = 3;
/** @hide */ /** @hide */
@StringDef({ @IntDef({
AVAILABILITY_AVAILABLE, AVAILABILITY_AVAILABLE,
AVAILABILITY_FREE_WITH_SUBSCRIPTION, AVAILABILITY_FREE_WITH_SUBSCRIPTION,
AVAILABILITY_PAID_CONTENT, AVAILABILITY_PAID_CONTENT,
@ -997,15 +998,14 @@ public final class TvContract {
* *
* @see #COLUMN_AVAILABILITY * @see #COLUMN_AVAILABILITY
*/ */
String AVAILABILITY_AVAILABLE = "AVAILABILITY_AVAILABLE"; int AVAILABILITY_AVAILABLE = 0;
/** /**
* The availability for "free with subscription". * The availability for "free with subscription".
* *
* @see #COLUMN_AVAILABILITY * @see #COLUMN_AVAILABILITY
*/ */
String AVAILABILITY_FREE_WITH_SUBSCRIPTION = int AVAILABILITY_FREE_WITH_SUBSCRIPTION = 1;
"AVAILABILITY_FREE_WITH_SUBSCRIPTION";
/** /**
* The availability for "paid content, either to-own or rental * The availability for "paid content, either to-own or rental
@ -1013,72 +1013,72 @@ public final class TvContract {
* *
* @see #COLUMN_AVAILABILITY * @see #COLUMN_AVAILABILITY
*/ */
String AVAILABILITY_PAID_CONTENT = "AVAILABILITY_PAID_CONTENT"; int AVAILABILITY_PAID_CONTENT = 2;
/** @hide */ /** @hide */
@StringDef({ @IntDef({
INTERACTION_TYPE_VIEWS,
INTERACTION_TYPE_LISTENS, INTERACTION_TYPE_LISTENS,
INTERACTION_TYPE_FOLLOWERS, INTERACTION_TYPE_FOLLOWERS,
INTERACTION_TYPE_FANS, INTERACTION_TYPE_FANS,
INTERACTION_TYPE_LIKES, INTERACTION_TYPE_LIKES,
INTERACTION_TYPE_THUMBS, INTERACTION_TYPE_THUMBS,
INTERACTION_TYPE_VIEWS,
INTERACTION_TYPE_VIEWERS, INTERACTION_TYPE_VIEWERS,
}) })
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
public @interface InteractionType {} public @interface InteractionType {}
/**
* The interaction type for "views".
*
* @see #COLUMN_INTERACTION_TYPE
*/
int INTERACTION_TYPE_VIEWS = 0;
/** /**
* The interaction type for "listens". * The interaction type for "listens".
* *
* @see #COLUMN_INTERACTION_TYPE * @see #COLUMN_INTERACTION_TYPE
*/ */
String INTERACTION_TYPE_LISTENS = "INTERACTION_TYPE_LISTENS"; int INTERACTION_TYPE_LISTENS = 1;
/** /**
* The interaction type for "followers". * The interaction type for "followers".
* *
* @see #COLUMN_INTERACTION_TYPE * @see #COLUMN_INTERACTION_TYPE
*/ */
String INTERACTION_TYPE_FOLLOWERS = "INTERACTION_TYPE_FOLLOWERS"; int INTERACTION_TYPE_FOLLOWERS = 2;
/** /**
* The interaction type for "fans". * The interaction type for "fans".
* *
* @see #COLUMN_INTERACTION_TYPE * @see #COLUMN_INTERACTION_TYPE
*/ */
String INTERACTION_TYPE_FANS = "INTERACTION_TYPE_FANS"; int INTERACTION_TYPE_FANS = 3;
/** /**
* The interaction type for "likes". * The interaction type for "likes".
* *
* @see #COLUMN_INTERACTION_TYPE * @see #COLUMN_INTERACTION_TYPE
*/ */
String INTERACTION_TYPE_LIKES = "INTERACTION_TYPE_LIKES"; int INTERACTION_TYPE_LIKES = 4;
/** /**
* The interaction type for "thumbs". * The interaction type for "thumbs".
* *
* @see #COLUMN_INTERACTION_TYPE * @see #COLUMN_INTERACTION_TYPE
*/ */
String INTERACTION_TYPE_THUMBS = "INTERACTION_TYPE_THUMBS"; int INTERACTION_TYPE_THUMBS = 5;
/**
* The interaction type for "views".
*
* @see #COLUMN_INTERACTION_TYPE
*/
String INTERACTION_TYPE_VIEWS = "INTERACTION_TYPE_VIEWS";
/** /**
* The interaction type for "viewers". * The interaction type for "viewers".
* *
* @see #COLUMN_INTERACTION_TYPE * @see #COLUMN_INTERACTION_TYPE
*/ */
String INTERACTION_TYPE_VIEWERS = "INTERACTION_TYPE_VIEWERS"; int INTERACTION_TYPE_VIEWERS = 6;
/** @hide */ /** @hide */
@StringDef({ @IntDef({
REVIEW_RATING_STYLE_STARS, REVIEW_RATING_STYLE_STARS,
REVIEW_RATING_STYLE_THUMBS_UP_DOWN, REVIEW_RATING_STYLE_THUMBS_UP_DOWN,
REVIEW_RATING_STYLE_PERCENTAGE, REVIEW_RATING_STYLE_PERCENTAGE,
@ -1091,23 +1091,21 @@ public final class TvContract {
* *
* @see #COLUMN_REVIEW_RATING_STYLE * @see #COLUMN_REVIEW_RATING_STYLE
*/ */
String REVIEW_RATING_STYLE_STARS = "REVIEW_RATING_STYLE_STARS"; int REVIEW_RATING_STYLE_STARS = 0;
/** /**
* The review rating style for thumbs-up and thumbs-down rating. * The review rating style for thumbs-up and thumbs-down rating.
* *
* @see #COLUMN_REVIEW_RATING_STYLE * @see #COLUMN_REVIEW_RATING_STYLE
*/ */
String REVIEW_RATING_STYLE_THUMBS_UP_DOWN = int REVIEW_RATING_STYLE_THUMBS_UP_DOWN = 1;
"REVIEW_RATING_STYLE_THUMBS_UP_DOWN";
/** /**
* The review rating style for 0 to 100 point system. * The review rating style for 0 to 100 point system.
* *
* @see #COLUMN_REVIEW_RATING_STYLE * @see #COLUMN_REVIEW_RATING_STYLE
*/ */
String REVIEW_RATING_STYLE_PERCENTAGE = int REVIEW_RATING_STYLE_PERCENTAGE = 2;
"REVIEW_RATING_STYLE_PERCENTAGE";
/** /**
* The type of this program content. * The type of this program content.
@ -1129,7 +1127,7 @@ public final class TvContract {
* <p>This is a required field if the program is from a {@link Channels#TYPE_PREVIEW} * <p>This is a required field if the program is from a {@link Channels#TYPE_PREVIEW}
* channel. * channel.
* *
* <p>Type: TEXT * <p>Type: INTEGER
*/ */
String COLUMN_TYPE = "type"; String COLUMN_TYPE = "type";
@ -1142,7 +1140,7 @@ public final class TvContract {
* {@link #ASPECT_RATIO_1_1}, and * {@link #ASPECT_RATIO_1_1}, and
* {@link #ASPECT_RATIO_2_3}. * {@link #ASPECT_RATIO_2_3}.
* *
* <p>Type: TEXT * <p>Type: INTEGER
*/ */
String COLUMN_POSTER_ART_ASPECT_RATIO = "poster_art_aspect_ratio"; String COLUMN_POSTER_ART_ASPECT_RATIO = "poster_art_aspect_ratio";
@ -1155,7 +1153,7 @@ public final class TvContract {
* {@link #ASPECT_RATIO_1_1}, and * {@link #ASPECT_RATIO_1_1}, and
* {@link #ASPECT_RATIO_2_3}. * {@link #ASPECT_RATIO_2_3}.
* *
* <p>Type: TEXT * <p>Type: INTEGER
*/ */
String COLUMN_THUMBNAIL_ASPECT_RATIO = "poster_thumbnail_aspect_ratio"; String COLUMN_THUMBNAIL_ASPECT_RATIO = "poster_thumbnail_aspect_ratio";
@ -1188,7 +1186,7 @@ public final class TvContract {
* {@link #AVAILABILITY_FREE_WITH_SUBSCRIPTION}, and * {@link #AVAILABILITY_FREE_WITH_SUBSCRIPTION}, and
* {@link #AVAILABILITY_PAID_CONTENT}. * {@link #AVAILABILITY_PAID_CONTENT}.
* *
* <p>Type: TEXT * <p>Type: INTEGER
*/ */
String COLUMN_AVAILABILITY = "availability"; String COLUMN_AVAILABILITY = "availability";
@ -1327,15 +1325,15 @@ public final class TvContract {
* The type of interaction for this TV program. * The type of interaction for this TV program.
* *
* <p> The value should match one of the followings: * <p> The value should match one of the followings:
* {@link #INTERACTION_TYPE_VIEWS},
* {@link #INTERACTION_TYPE_LISTENS}, * {@link #INTERACTION_TYPE_LISTENS},
* {@link #INTERACTION_TYPE_FOLLOWERS}, * {@link #INTERACTION_TYPE_FOLLOWERS},
* {@link #INTERACTION_TYPE_FANS}, * {@link #INTERACTION_TYPE_FANS},
* {@link #INTERACTION_TYPE_LIKES}, * {@link #INTERACTION_TYPE_LIKES},
* {@link #INTERACTION_TYPE_THUMBS}, * {@link #INTERACTION_TYPE_THUMBS}, and
* {@link #INTERACTION_TYPE_VIEWS}, and
* {@link #INTERACTION_TYPE_VIEWERS}. * {@link #INTERACTION_TYPE_VIEWERS}.
* *
* <p>Type: TEXT * <p>Type: INTEGER
* @see #COLUMN_INTERACTION_COUNT * @see #COLUMN_INTERACTION_COUNT
*/ */
String COLUMN_INTERACTION_TYPE = "interaction_type"; String COLUMN_INTERACTION_TYPE = "interaction_type";
@ -1363,7 +1361,7 @@ public final class TvContract {
* <p> The value should match one of the followings: {@link #REVIEW_RATING_STYLE_STARS}, * <p> The value should match one of the followings: {@link #REVIEW_RATING_STYLE_STARS},
* {@link #REVIEW_RATING_STYLE_THUMBS_UP_DOWN}, and {@link #REVIEW_RATING_STYLE_PERCENTAGE}. * {@link #REVIEW_RATING_STYLE_THUMBS_UP_DOWN}, and {@link #REVIEW_RATING_STYLE_PERCENTAGE}.
* *
* <p>Type: TEXT * <p>Type: INTEGER
* @see #COLUMN_REVIEW_RATING * @see #COLUMN_REVIEW_RATING
*/ */
String COLUMN_REVIEW_RATING_STYLE = "review_rating_style"; String COLUMN_REVIEW_RATING_STYLE = "review_rating_style";
@ -2724,7 +2722,7 @@ public final class TvContract {
public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/watch_next_program"; public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/watch_next_program";
/** @hide */ /** @hide */
@StringDef({ @IntDef({
WATCH_NEXT_TYPE_CONTINUE, WATCH_NEXT_TYPE_CONTINUE,
WATCH_NEXT_TYPE_NEXT, WATCH_NEXT_TYPE_NEXT,
WATCH_NEXT_TYPE_NEW, WATCH_NEXT_TYPE_NEW,
@ -2739,7 +2737,7 @@ public final class TvContract {
* *
* @see #COLUMN_WATCH_NEXT_TYPE * @see #COLUMN_WATCH_NEXT_TYPE
*/ */
public static final String WATCH_NEXT_TYPE_CONTINUE = "WATCH_NEXT_TYPE_CONTINUE"; public static final int WATCH_NEXT_TYPE_CONTINUE = 0;
/** /**
* The watch next type for NEXT. Use this type when the user has watched one or more * The watch next type for NEXT. Use this type when the user has watched one or more
@ -2749,7 +2747,7 @@ public final class TvContract {
* *
* @see #COLUMN_WATCH_NEXT_TYPE * @see #COLUMN_WATCH_NEXT_TYPE
*/ */
public static final String WATCH_NEXT_TYPE_NEXT = "WATCH_NEXT_TYPE_NEXT"; public static final int WATCH_NEXT_TYPE_NEXT = 1;
/** /**
* The watch next type for NEW. Use this type when the user had watched all of the available * The watch next type for NEW. Use this type when the user had watched all of the available
@ -2759,7 +2757,7 @@ public final class TvContract {
* *
* @see #COLUMN_WATCH_NEXT_TYPE * @see #COLUMN_WATCH_NEXT_TYPE
*/ */
public static final String WATCH_NEXT_TYPE_NEW = "WATCH_NEXT_TYPE_NEW"; public static final int WATCH_NEXT_TYPE_NEW = 2;
/** /**
* The watch next type for WATCHLIST. Use this type when the user has elected to explicitly * The watch next type for WATCHLIST. Use this type when the user has elected to explicitly
@ -2768,7 +2766,7 @@ public final class TvContract {
* *
* @see #COLUMN_WATCH_NEXT_TYPE * @see #COLUMN_WATCH_NEXT_TYPE
*/ */
public static final String WATCH_NEXT_TYPE_WATCHLIST = "WATCH_NEXT_TYPE_WATCHLIST"; public static final int WATCH_NEXT_TYPE_WATCHLIST = 3;
/** /**
* The "watch next" type of this program content. * The "watch next" type of this program content.
@ -2781,7 +2779,7 @@ public final class TvContract {
* *
* <p>This is a required field. * <p>This is a required field.
* *
* <p>Type: TEXT * <p>Type: INTEGER
*/ */
public static final String COLUMN_WATCH_NEXT_TYPE = "watch_next_type"; public static final String COLUMN_WATCH_NEXT_TYPE = "watch_next_type";