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

am cf9c8d95: Merge "TIF: Add a content rating system for Brazil" into lmp-dev

Browse Source 
* commit 'cf9c8d95525991e3f4239e24609cf020bf083495':
  TIF: Add a content rating system for Brazil
This commit is contained in:
Sungsoo Lim
2014-08-06 12:51:02 +00:00
committed by Android Git Automerger
parent 4c2c87f8ff 0831de10c8
commit ce9d13757b
3 changed files with 133 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/res/res/values/strings.xml
View File

@@ -4870,6 +4870,19 @@
<!-- TV content rating system strings for BG TV -->
<!-- TV content rating system strings for BR TV -->
<string name="display_name_brtv" translatable="false">Brazil Content Rating</string>
<string name="display_name_brtv_l" translatable="false">Livre</string>
<string name="display_name_brtv_10" translatable="false">10 anos</string>
<string name="display_name_brtv_12" translatable="false">12 anos</string>
<string name="display_name_brtv_14" translatable="false">14 anos</string>
<string name="display_name_brtv_16" translatable="false">16 anos</string>
<string name="display_name_brtv_18" translatable="false">18 anos</string>
<string name="description_brtv_l" translatable="false">Livre para todos os públicos</string>
<string name="description_brtv_10" translatable="false">Não recomendado para menores de 10 anos</string>
<string name="description_brtv_12" translatable="false">Não recomendado para menores de 10 anos</string>
<string name="description_brtv_14" translatable="false">Não recomendado para menores de 14 anos</string>
<string name="description_brtv_16" translatable="false">Não recomendado para menores de 16 anos</string>
<string name="description_brtv_18" translatable="false">Não recomendado para menores de 18 anos</string>
<!-- TV content rating system strings for CA TV -->
@@ -4936,8 +4949,6 @@
<!-- TV content rating system strings for IS TV -->
<!-- TV content rating system strings for IT TV -->
<!-- TV content rating system strings for KH TV -->
<!-- TV content rating system strings for KR TV -->

38
core/res/res/xml/tv_content_rating_systems.xml
View File

@@ -66,6 +66,42 @@
<!-- TV content rating system for BG TV -->
<!-- TV content rating system for BR TV -->
<rating-system-definition id="BR_TV"
displayName="@string/display_name_brtv"
country="BR">
<rating-definition id="BR_TV_L"
displayName="@string/display_name_brtv_l"
description="@string/description_brtv_l"
ageHint="0" />
<rating-definition id="BR_TV_10"
displayName="@string/display_name_brtv_10"
description="@string/description_brtv_10"
ageHint="10" />
<rating-definition id="BR_TV_12"
displayName="@string/display_name_brtv_12"
description="@string/description_brtv_12"
ageHint="12" />
<rating-definition id="BR_TV_14"
displayName="@string/display_name_brtv_14"
description="@string/description_brtv_14"
ageHint="14" />
<rating-definition id="BR_TV_16"
displayName="@string/display_name_brtv_16"
description="@string/description_brtv_16"
ageHint="16" />
<rating-definition id="BR_TV_18"
displayName="@string/display_name_brtv_18"
description="@string/description_brtv_18"
ageHint="18" />
<order>
<rating id="BR_TV_L" />
<rating id="BR_TV_10" />
<rating id="BR_TV_12" />
<rating id="BR_TV_14" />
<rating id="BR_TV_16" />
<rating id="BR_TV_18" />
</order>
</rating-system-definition>
<!-- TV content rating system for CA TV -->
@@ -192,8 +228,6 @@
<!-- TV content rating system for IS TV -->
<!-- TV content rating system for IT TV -->
<!-- TV content rating system for KH TV -->
<!-- TV content rating system for KR TV -->

100
media/java/android/media/tv/TvContentRating.java
View File

@@ -355,10 +355,90 @@ import java.util.List;
* <td>BG_TV_ALL</td>
* <td></td>
* </tr-->
* <!--tr>
* <td>BR_TV_ALL</td>
* <td></td>
* </tr-->
* <tr>
* <td>BR_TV_L</td>
* <td>A rating string for {@code BR_TV}. This classification applies to works which contain
* predominantly positive contents and which do not bring unsuitable elements subject to
* ratings to ages higher than 10, such as the ones listed below:
* <dl>
* <dd><b>Violence</b>: Fantasy violence; display of arms with no violence; deaths with no
* violence; bones and skeletons with no violence.</dd>
* <dd><b>Sex and Nudity</b>: Non-erotic nudity.</dd>
* <dd><b>Drugs</b>: Moderate or insinuated use of legal drugs.</dd>
* </dl>
* </td>
* </tr>
* <tr>
* <td>BR_TV_10</td>
* <td>A rating string for {@code BR_TV}. Not recommended for ages under 10. The following
* contents are accepted for this age range:
* <dl>
* <dd><b>Violence</b>: Display of arms with violence; fear/tension; distress; bones and
* skeletons with signs of violent acts; criminal acts without violence; derogatory
* language.</dd>
* <dd><b>Sex and Nudity</b>: Educational contents about sex.</dd>
* <dd><b>Drugs</b>: Oral description of the use of legal drugs; discussion on the issue
* "drug trafficking"; medicinal use of illegal drugs.</dd>
* </dl>
* </td>
* </tr>
* <tr>
* <td>BR_TV_12</td>
* <td>A rating string for {@code BR_TV}. Not recommended for ages under 12. The following
* contents are accepted for this age range:
* <dl>
* <dd><b>Violence</b>: Violent act; body injury; description of violence; presence of
* blood; victim's grief; natural or accidental death with violence; violent act against
* animals; exposure to danger; showing people in embarrassing or degrading situations;
* verbal aggression; obscenity; bullying; corpses; sexual harassment; overvaluation of the
* physical beauty; overvaluation of consumption.</dd>
* <dd><b>Sex and Nudity</b>: Veiled nudity; sexual innuendo; sexual fondling; masturbation;
* foul language; sex content language; sex simulation; sexual appeal.</dd>
* <dd><b>Drugs</b>: Use of legal drugs; inducing the use of legal drugs; irregular use of
* medication; mention to illegal drugs.</dd>
* </dl>
* </td>
* </tr>
* <tr>
* <td>BR_TV_14</td>
* <td>A rating string for {@code BR_TV}. Not recommended for ages under 14. The following
* contents are accepted for this age range:
* <dl>
* <dd><b>Violence</b>: Intentional death; stigma/prejudice.</dd>
* <dd><b>Sex and Nudity</b>: Nudity; erotization; vulgarity; sexual intercourse;
* prostitution.</dd>
* <dd><b>Drugs</b>: Insinuation of the use of illegal drugs; verbal descriptions of the use
* or trafficking of illegal drugs; discussion on the "decriminalization of illegal drugs".</dd>
* </dl>
* </td>
* </tr>
* <tr>
* <td>BR_TV_16</td>
* <td>A rating string for {@code BR_TV}. Not recommended for ages under 16. The following
* contents are accepted for this age range:
* <dl>
* <dd><b>Violence</b>: Rape; sexual exploitation; sexual coercion; torture; mutilation;
* suicide; gratuitous violence/banalization of violence; abortion, death penalty,
* euthanasia.</dd>
* <dd><b>Sex and Nudity</b>: Intense sexual intercourse.</dd>
* <dd><b>Drugs</b>: Production or trafficking of any illegal drug; use of illegal drugs;
* inducing the use of illegal drugs.</dd>
* </dl>
* </td>
* </tr>
* <tr>
* <td>BR_TV_18</td>
* <td>A rating string for {@code BR_TV}. Not recommended for ages under 18. The following
* contents are accepted for this age range:
* <dl>
* <dd><b>Violence</b>: Violence of high impact; exaltation, glamorization and/or
* incitement to violence; cruelty; hate crimes; pedophilia.</dd>
* <dd><b>Sex and Nudity</b>: Explicit sex; complex/strong impact sexual intercourses
* (incest, group sex, violent fetish and pornography overall).</dd>
* <dd><b>Drugs</b>: Inciting the use of illegal drugs.</dd>
* </dl>
* </td>
* </tr>
* <!--tr>
* <td>CA_TV_ALL</td>
* <td></td>
@@ -495,10 +575,6 @@ import java.util.List;
* <td></td>
* </tr-->
* <!--tr>
* <td>IT_TV_ALL</td>
* <td></td>
* </tr-->
* <!--tr>
* <td>KH_TV_ALL</td>
* <td></td>
* </tr-->
@@ -705,10 +781,6 @@ import java.util.List;
* <td></td>
* </tr-->
* <!--tr>
* <td>BR_TV_</td>
* <td></td>
* </tr-->
* <!--tr>
* <td>CA_TV_</td>
* <td></td>
* </tr-->
@@ -765,10 +837,6 @@ import java.util.List;
* <td></td>
* </tr-->
* <!--tr>
* <td>IT_TV_</td>
* <td></td>
* </tr-->
* <!--tr>
* <td>KH_TV_</td>
* <td></td>
* </tr-->