Merge "TIF: use integer for constants instead of string" into oc-dev (b43a5305) · Commits · e / os / android_frameworks_base

api/current.txt

+33 −33

Original line number	Diff line number	Diff line
		@@ -24542,13 +24542,13 @@ package android.media.tv {
		}

		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 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 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_3_2 = 1; // 0x1
		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
		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_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_TRANSIENT = "transient";
		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 java.lang.String INTERACTION_TYPE_FOLLOWERS = "INTERACTION_TYPE_FOLLOWERS";
		field public static final java.lang.String INTERACTION_TYPE_LIKES = "INTERACTION_TYPE_LIKES";
		field public static final java.lang.String INTERACTION_TYPE_LISTENS = "INTERACTION_TYPE_LISTENS";
		field public static final java.lang.String INTERACTION_TYPE_THUMBS = "INTERACTION_TYPE_THUMBS";
		field public static final java.lang.String INTERACTION_TYPE_VIEWERS = "INTERACTION_TYPE_VIEWERS";
		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_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 int INTERACTION_TYPE_FANS = 3; // 0x3
		field public static final int INTERACTION_TYPE_FOLLOWERS = 2; // 0x2
		field public static final int INTERACTION_TYPE_LIKES = 4; // 0x4
		field public static final int INTERACTION_TYPE_LISTENS = 1; // 0x1
		field public static final int INTERACTION_TYPE_THUMBS = 5; // 0x5
		field public static final int INTERACTION_TYPE_VIEWERS = 6; // 0x6
		field public static final int INTERACTION_TYPE_VIEWS = 0; // 0x0
		field public static final int REVIEW_RATING_STYLE_PERCENTAGE = 2; // 0x2
		field public static final int REVIEW_RATING_STYLE_STARS = 0; // 0x0
		field public static final int REVIEW_RATING_STYLE_THUMBS_UP_DOWN = 1; // 0x1
		field public static final int TYPE_ALBUM = 8; // 0x8
		field public static final int TYPE_ARTIST = 9; // 0x9
		field public static final int TYPE_CHANNEL = 6; // 0x6
		field public static final int TYPE_CLIP = 4; // 0x4
		field public static final int TYPE_EVENT = 5; // 0x5
		field public static final int TYPE_MOVIE = 0; // 0x0
		field public static final int TYPE_PLAYLIST = 10; // 0xa
		field public static final int TYPE_STATION = 11; // 0xb
		field public static final int TYPE_TRACK = 7; // 0x7
		field public static final int TYPE_TV_EPISODE = 3; // 0x3
		field public static final int TYPE_TV_SEASON = 2; // 0x2
		field public static final int TYPE_TV_SERIES = 1; // 0x1
		}

		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_TYPE = "vnd.android.cursor.dir/watch_next_program";
		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 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";
		field public static final java.lang.String WATCH_NEXT_TYPE_WATCHLIST = "WATCH_NEXT_TYPE_WATCHLIST";
		field public static final int WATCH_NEXT_TYPE_CONTINUE = 0; // 0x0
		field public static final int WATCH_NEXT_TYPE_NEW = 2; // 0x2
		field public static final int WATCH_NEXT_TYPE_NEXT = 1; // 0x1
		field public static final int WATCH_NEXT_TYPE_WATCHLIST = 3; // 0x3
		}

		public final class TvInputInfo implements android.os.Parcelable {

api/system-current.txt

+33 −33

Original line number	Diff line number	Diff line
		@@ -26483,13 +26483,13 @@ package android.media.tv {
		}

		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 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 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_3_2 = 1; // 0x1
		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
		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_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_TRANSIENT = "transient";
		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 java.lang.String INTERACTION_TYPE_FOLLOWERS = "INTERACTION_TYPE_FOLLOWERS";
		field public static final java.lang.String INTERACTION_TYPE_LIKES = "INTERACTION_TYPE_LIKES";
		field public static final java.lang.String INTERACTION_TYPE_LISTENS = "INTERACTION_TYPE_LISTENS";
		field public static final java.lang.String INTERACTION_TYPE_THUMBS = "INTERACTION_TYPE_THUMBS";
		field public static final java.lang.String INTERACTION_TYPE_VIEWERS = "INTERACTION_TYPE_VIEWERS";
		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_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 int INTERACTION_TYPE_FANS = 3; // 0x3
		field public static final int INTERACTION_TYPE_FOLLOWERS = 2; // 0x2
		field public static final int INTERACTION_TYPE_LIKES = 4; // 0x4
		field public static final int INTERACTION_TYPE_LISTENS = 1; // 0x1
		field public static final int INTERACTION_TYPE_THUMBS = 5; // 0x5
		field public static final int INTERACTION_TYPE_VIEWERS = 6; // 0x6
		field public static final int INTERACTION_TYPE_VIEWS = 0; // 0x0
		field public static final int REVIEW_RATING_STYLE_PERCENTAGE = 2; // 0x2
		field public static final int REVIEW_RATING_STYLE_STARS = 0; // 0x0
		field public static final int REVIEW_RATING_STYLE_THUMBS_UP_DOWN = 1; // 0x1
		field public static final int TYPE_ALBUM = 8; // 0x8
		field public static final int TYPE_ARTIST = 9; // 0x9
		field public static final int TYPE_CHANNEL = 6; // 0x6
		field public static final int TYPE_CLIP = 4; // 0x4
		field public static final int TYPE_EVENT = 5; // 0x5
		field public static final int TYPE_MOVIE = 0; // 0x0
		field public static final int TYPE_PLAYLIST = 10; // 0xa
		field public static final int TYPE_STATION = 11; // 0xb
		field public static final int TYPE_TRACK = 7; // 0x7
		field public static final int TYPE_TV_EPISODE = 3; // 0x3
		field public static final int TYPE_TV_SEASON = 2; // 0x2
		field public static final int TYPE_TV_SERIES = 1; // 0x1
		}

		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_TYPE = "vnd.android.cursor.dir/watch_next_program";
		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 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";
		field public static final java.lang.String WATCH_NEXT_TYPE_WATCHLIST = "WATCH_NEXT_TYPE_WATCHLIST";
		field public static final int WATCH_NEXT_TYPE_CONTINUE = 0; // 0x0
		field public static final int WATCH_NEXT_TYPE_NEW = 2; // 0x2
		field public static final int WATCH_NEXT_TYPE_NEXT = 1; // 0x1
		field public static final int WATCH_NEXT_TYPE_WATCHLIST = 3; // 0x3
		}

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

api/test-current.txt

+33 −33

Original line number	Diff line number	Diff line
		@@ -24655,13 +24655,13 @@ package android.media.tv {
		}

		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 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 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_3_2 = 1; // 0x1
		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
		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_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_TRANSIENT = "transient";
		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 java.lang.String INTERACTION_TYPE_FOLLOWERS = "INTERACTION_TYPE_FOLLOWERS";
		field public static final java.lang.String INTERACTION_TYPE_LIKES = "INTERACTION_TYPE_LIKES";
		field public static final java.lang.String INTERACTION_TYPE_LISTENS = "INTERACTION_TYPE_LISTENS";
		field public static final java.lang.String INTERACTION_TYPE_THUMBS = "INTERACTION_TYPE_THUMBS";
		field public static final java.lang.String INTERACTION_TYPE_VIEWERS = "INTERACTION_TYPE_VIEWERS";
		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_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 int INTERACTION_TYPE_FANS = 3; // 0x3
		field public static final int INTERACTION_TYPE_FOLLOWERS = 2; // 0x2
		field public static final int INTERACTION_TYPE_LIKES = 4; // 0x4
		field public static final int INTERACTION_TYPE_LISTENS = 1; // 0x1
		field public static final int INTERACTION_TYPE_THUMBS = 5; // 0x5
		field public static final int INTERACTION_TYPE_VIEWERS = 6; // 0x6
		field public static final int INTERACTION_TYPE_VIEWS = 0; // 0x0
		field public static final int REVIEW_RATING_STYLE_PERCENTAGE = 2; // 0x2
		field public static final int REVIEW_RATING_STYLE_STARS = 0; // 0x0
		field public static final int REVIEW_RATING_STYLE_THUMBS_UP_DOWN = 1; // 0x1
		field public static final int TYPE_ALBUM = 8; // 0x8
		field public static final int TYPE_ARTIST = 9; // 0x9
		field public static final int TYPE_CHANNEL = 6; // 0x6
		field public static final int TYPE_CLIP = 4; // 0x4
		field public static final int TYPE_EVENT = 5; // 0x5
		field public static final int TYPE_MOVIE = 0; // 0x0
		field public static final int TYPE_PLAYLIST = 10; // 0xa
		field public static final int TYPE_STATION = 11; // 0xb
		field public static final int TYPE_TRACK = 7; // 0x7
		field public static final int TYPE_TV_EPISODE = 3; // 0x3
		field public static final int TYPE_TV_SEASON = 2; // 0x2
		field public static final int TYPE_TV_SERIES = 1; // 0x1
		}

		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_TYPE = "vnd.android.cursor.dir/watch_next_program";
		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 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";
		field public static final java.lang.String WATCH_NEXT_TYPE_WATCHLIST = "WATCH_NEXT_TYPE_WATCHLIST";
		field public static final int WATCH_NEXT_TYPE_CONTINUE = 0; // 0x0
		field public static final int WATCH_NEXT_TYPE_NEW = 2; // 0x2
		field public static final int WATCH_NEXT_TYPE_NEXT = 1; // 0x1
		field public static final int WATCH_NEXT_TYPE_WATCHLIST = 3; // 0x3
		}

		public final class TvInputInfo implements android.os.Parcelable {

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

+56 −58

File changed.

Preview size limit exceeded, changes collapsed.