Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TvContract: Change constants of canonical genres to all-caps values"

Browse Source
This commit is contained in:
Jae Seo
2014-06-19 00:25:04 +00:00
committed by Android (Google) Code Review
parent 0e33c1286d acc1957d78
commit 3bbd9be166
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
api/current.txt
View File

@@ -15943,17 +15943,17 @@ package android.media.tv {
public static final class TvContract.Programs.Genres {
method public static java.lang.String[] decode(java.lang.String);
method public static java.lang.String encode(java.lang.String...);
field public static final java.lang.String ANIMAL_WILDLIFE = "Animal/Wildlife";
field public static final java.lang.String COMEDY = "Comedy";
field public static final java.lang.String DRAMA = "Drama";
field public static final java.lang.String EDUCATION = "Education";
field public static final java.lang.String FAMILY_KIDS = "Family/Kids";
field public static final java.lang.String GAMING = "Gaming";
field public static final java.lang.String MOVIES = "Movies";
field public static final java.lang.String NEWS = "News";
field public static final java.lang.String SHOPPING = "Shopping";
field public static final java.lang.String SPORTS = "Sports";
field public static final java.lang.String TRAVEL = "Travel";
field public static final java.lang.String ANIMAL_WILDLIFE = "ANIMAL_WILDLIFE";
field public static final java.lang.String COMEDY = "COMEDY";
field public static final java.lang.String DRAMA = "DRAMA";
field public static final java.lang.String EDUCATION = "EDUCATION";
field public static final java.lang.String FAMILY_KIDS = "FAMILY_KIDS";
field public static final java.lang.String GAMING = "GAMING";
field public static final java.lang.String MOVIES = "MOVIES";
field public static final java.lang.String NEWS = "NEWS";
field public static final java.lang.String SHOPPING = "SHOPPING";
field public static final java.lang.String SPORTS = "SPORTS";
field public static final java.lang.String TRAVEL = "TRAVEL";
}
public final class TvInputInfo implements android.os.Parcelable {

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

@@ -899,37 +899,37 @@ public final class TvContract {
/** Canonical genres for TV programs. */
public static final class Genres {
/** The genre for Family/Kids. */
public static final String FAMILY_KIDS = "Family/Kids";
public static final String FAMILY_KIDS = "FAMILY_KIDS";
/** The genre for Sports. */
public static final String SPORTS = "Sports";
public static final String SPORTS = "SPORTS";
/** The genre for Shopping. */
public static final String SHOPPING = "Shopping";
public static final String SHOPPING = "SHOPPING";
/** The genre for Movies. */
public static final String MOVIES = "Movies";
public static final String MOVIES = "MOVIES";
/** The genre for Comedy. */
public static final String COMEDY = "Comedy";
public static final String COMEDY = "COMEDY";
/** The genre for Travel. */
public static final String TRAVEL = "Travel";
public static final String TRAVEL = "TRAVEL";
/** The genre for Drama. */
public static final String DRAMA = "Drama";
public static final String DRAMA = "DRAMA";
/** The genre for Education. */
public static final String EDUCATION = "Education";
public static final String EDUCATION = "EDUCATION";
/** The genre for Animal/Wildlife. */
public static final String ANIMAL_WILDLIFE = "Animal/Wildlife";
public static final String ANIMAL_WILDLIFE = "ANIMAL_WILDLIFE";
/** The genre for News. */
public static final String NEWS = "News";
public static final String NEWS = "NEWS";
/** The genre for Gaming. */
public static final String GAMING = "Gaming";
public static final String GAMING = "GAMING";
private Genres() {}