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

Commit e5f332fa authored by Sungsoo Lim's avatar Sungsoo Lim Committed by Android Git Automerger
Browse files

am eb77c228: Merge "TIF: Use XML file for representing TvContentRating" into lmp-dev 

* commit 'eb77c228a67f34e2b8be9dbfe956df2e73fa699a':
  TIF: Use XML file for representing TvContentRating
parents 0ad7a8d9 2d998266

api/current.txt

+5 −18
Original line number Diff line number Diff line
@@ -465,6 +465,7 @@ package android { 
    field public static final int contentInsetLeft = 16843863; // 0x1010457

    field public static final int contentInsetRight = 16843864; // 0x1010458

    field public static final int contentInsetStart = 16843861; // 0x1010455

    field public static final int contentRatingSystemXml = 16843957; // 0x10104b5

    field public static final int controlX1 = 16843798; // 0x1010416

    field public static final int controlX2 = 16843800; // 0x1010418

    field public static final int controlY1 = 16843799; // 0x1010417
@@ -16843,28 +16844,14 @@ package android.media.session { 
package android.media.tv {















  public final class TvContentRating {













    ctor public TvContentRating(java.lang.String);













    ctor public TvContentRating(java.lang.String, java.lang.String[]);













    method public static android.media.tv.TvContentRating createRating(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String...);















    method public java.lang.String flattenToString();













    method public java.lang.String getCountry();













    method public java.lang.String getDomain();















    method public java.lang.String getMainRating();













    method public java.lang.String getRatingSystem();















    method public java.util.List<java.lang.String> getSubRatings();















    method public static android.media.tv.TvContentRating unflattenFromString(java.lang.String);













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













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













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













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













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













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













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













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













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













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













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













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













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













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













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













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















  }





























  public final class TvContract {

























core/res/res/values/attrs.xml



+3
−1




























Original line number
Diff line number
Diff line








@@ -7259,7 +7259,9 @@













        <!-- Component name of an activity that allows the user to modify















             the settings for this service. -->















        <attr name="settingsActivity" />













        <!-- Type of this service. -->













        <!-- Component name of an xml file that describes the structure of TV content ratings that













             this service uses. -->













        <attr name="contentRatingSystemXml" format="reference" />















    </declare-styleable>































    <declare-styleable name="ResolverDrawerLayout">

































core/res/res/values/public.xml



+2
−0




























Original line number
Diff line number
Diff line








@@ -2560,4 +2560,6 @@













  <public type="raw" name="loaderror" id="0x01100000"/>















  <!-- WebView error page for when domain lookup fails. @hide @SystemApi -->















  <public type="raw" name="nodomain"/>



























  <public type="attr" name="contentRatingSystemXml"/>















</resources>
























core/res/res/values/strings.xml



+37
−0




























Original line number
Diff line number
Diff line








@@ -4841,4 +4841,41 @@













    <!-- Lock-to-app unlock password string -->















    <string name="lock_to_app_unlock_password">password</string>





























    <string name="display_name_ustvpg" translatable="false">US-TV</string>













    <string name="description_ustvpg">The TV Parental Guidelines</string>













    <string name="display_name_krtv" translatable="false">KR-TV</string>



























    <string name="display_name_ustvpg_d" translatable="false">D</string>













    <string name="display_name_ustvpg_l" translatable="false">L</string>













    <string name="display_name_ustvpg_s" translatable="false">S</string>













    <string name="display_name_ustvpg_v" translatable="false">V</string>













    <string name="display_name_ustvpg_fv" translatable="false">FV</string>













    <string name="display_name_ustvpg_y" translatable="false">TV-Y</string>













    <string name="display_name_ustvpg_y7" translatable="false">TV-Y7</string>













    <string name="display_name_ustvpg_g" translatable="false">TV-G</string>













    <string name="display_name_ustvpg_pg" translatable="false">TV-PG</string>













    <string name="display_name_ustvpg_14" translatable="false">TV-14</string>













    <string name="display_name_ustvpg_ma" translatable="false">TV-MA</string>













    <string name="display_name_krtv_all" translatable="false">모든연령시청가</string>













    <string name="display_name_krtv_7" translatable="false">7세이상시청가</string>













    <string name="display_name_krtv_12" translatable="false">12세이상시청가</string>













    <string name="display_name_krtv_15" translatable="false">15세이상시청가</string>













    <string name="display_name_krtv_19" translatable="false">19세이상시청가</string>



























    <string name="description_ustvpg_d">Suggestive dialogue (Usually means talks about sex)</string>













    <string name="description_ustvpg_l">Coarse language</string>













    <string name="description_ustvpg_s">Sexual content</string>













    <string name="description_ustvpg_v">Violence</string>













    <string name="description_ustvpg_fv">Fantasy violence (Children\'s programming only)</string>













    <string name="description_ustvpg_y">This program is designed to be appropriate for all children.</string>













    <string name="description_ustvpg_y7">This program is designed for children age 7 and above.</string>













    <string name="description_ustvpg_g">Most parents would find this program suitable for all ages.</string>













    <string name="description_ustvpg_pg">This program contains material that parents may find unsuitable for younger children.</string>













    <string name="description_ustvpg_14">This program contains some material that many parents would find unsuitable for children under 14 years of age.</string>













    <string name="description_ustvpg_ma">This program is specifically designed to be viewed by adults and therefore may be unsuitable for children under 17.</string>













    <string name="description_krtv_all">모든 연령의 시청자가 시청하기에 부적절한 내용이 없는 등급을 말한다.</string>













    <string name="description_krtv_7">7세미만의 어린이가 시청하기에 부적절한 내용이 포함되어 있어 보호자의 시청지도가 필요한 등급을 말한다.</string>













    <string name="description_krtv_12">12세미만의 청소년이 시청하기에 부적절한 내용이 포함되어 있어 보호자의 시청지도가 필요한 등급을 말한다.</string>













    <string name="description_krtv_15">15세미만의 청소년이 시청하기에 부적절한 내용이 포함되어 있어 보호자의 시청지도가 필요한 등급을 말한다.</string>













    <string name="description_krtv_19">19세미만의 청소년이 시청하기에 부적절한 내용이 포함되어 있어 청소년이 시청할 수 없는 등급을 말한다.</string>















</resources>
























core/res/res/values/symbols.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -1259,6 +1259,7 @@













  <java-symbol type="xml" name="audio_assets" />















  <java-symbol type="xml" name="global_keys" />















  <java-symbol type="xml" name="default_zen_mode_config" />













  <java-symbol type="xml" name="tv_content_rating_systems" />































  <java-symbol type="raw" name="accessibility_gestures" />















  <java-symbol type="raw" name="incognito_mode_start_page" />