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

Commit d53d07f6 authored by Dongwon Kang's avatar Dongwon Kang Committed by Android Git Automerger
Browse files

am 27c7a7d0: Merge "TIF: Define more cannonical genres in TvContract" into... 

am 27c7a7d0: Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev automerge: f6df7bff automerge: d048789a

* commit '27c7a7d0':
  TIF: Define more cannonical genres in TvContract
parents 0bc9da31 27c7a7d0

api/current.txt

+6 −0
Original line number Diff line number Diff line
@@ -16787,15 +16787,21 @@ package android.media.tv { 
    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 ARTS = "ARTS";

    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 ENTERTAINMENT = "ENTERTAINMENT";

    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 LIFE_STYLE = "LIFE_STYLE";

    field public static final java.lang.String MOVIES = "MOVIES";

    field public static final java.lang.String MUSIC = "MUSIC";

    field public static final java.lang.String NEWS = "NEWS";

    field public static final java.lang.String PREMIER = "PREMIER";

    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 TECH_SCIENCE = "TECH_SCIENCE";

    field public static final java.lang.String TRAVEL = "TRAVEL";

  }

























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



+24
−0




























Original line number
Diff line number
Diff line








@@ -1052,6 +1052,24 @@ public final class TvContract {













            /** The genre for Gaming. */















            public static final String GAMING = "GAMING";





























            /** The genre for Arts. */













            public static final String ARTS = "ARTS";



























            /** The genre for Entertainment. */













            public static final String ENTERTAINMENT = "ENTERTAINMENT";



























            /** The genre for Life Style. */













            public static final String LIFE_STYLE = "LIFE_STYLE";



























            /** The genre for Music. */













            public static final String MUSIC = "MUSIC";



























            /** The genre for Premier. */













            public static final String PREMIER = "PREMIER";



























            /** The genre for Tech/Science. */













            public static final String TECH_SCIENCE = "TECH_SCIENCE";





























            private static final ArraySet<String> CANONICAL_GENRES = new ArraySet<String>();















            static {















                CANONICAL_GENRES.add(FAMILY_KIDS);









@@ -1065,6 +1083,12 @@ public final class TvContract {













                CANONICAL_GENRES.add(ANIMAL_WILDLIFE);















                CANONICAL_GENRES.add(NEWS);















                CANONICAL_GENRES.add(GAMING);













                CANONICAL_GENRES.add(ARTS);













                CANONICAL_GENRES.add(ENTERTAINMENT);













                CANONICAL_GENRES.add(LIFE_STYLE);













                CANONICAL_GENRES.add(MUSIC);













                CANONICAL_GENRES.add(PREMIER);













                CANONICAL_GENRES.add(TECH_SCIENCE);















            }































            private Genres() {}