diff options
| author | Jae Seo <jaeseo@google.com> | 2014-06-19 00:25:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-19 00:17:11 +0000 |
| commit | 3bbd9be166fecc5c333f49e18a2f46c7355472cd (patch) | |
| tree | 047bb3eeee200f2eba114a851a96c464206dd19d /media | |
| parent | 0e33c1286d984555802f6b2b81ace9b6021c2d9f (diff) | |
| parent | acc1957d78bb52f90c38751d139d8808e2124007 (diff) | |
| download | frameworks_base-3bbd9be166fecc5c333f49e18a2f46c7355472cd.zip frameworks_base-3bbd9be166fecc5c333f49e18a2f46c7355472cd.tar.gz frameworks_base-3bbd9be166fecc5c333f49e18a2f46c7355472cd.tar.bz2 | |
Merge "TvContract: Change constants of canonical genres to all-caps values"
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/tv/TvContract.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java index 9e2a253..7e9d279 100644 --- a/media/java/android/media/tv/TvContract.java +++ b/media/java/android/media/tv/TvContract.java @@ -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() {} |