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

am b0ee5931: Merge "TIF: Add content rating system for Spain" into lmp-dev

Browse Source 
* commit 'b0ee59317533e2cac0efe24a85499fbfe56bee25':
  TIF: Add content rating system for Spain
This commit is contained in:
Dongwon Kang
2014-08-06 02:58:02 +00:00
committed by Android Git Automerger
parent 2a9c88bf37 65dc05248e
commit 3babc1d15e
3 changed files with 67 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4878,6 +4878,17 @@
<!-- TV content rating system strings for DK TV -->
<!-- TV content rating system strings for ES TV -->
<string name="display_name_estv" translatable="false">ES-TV</string>
<string name="display_name_estv_all" translatable="false">TP</string>
<string name="display_name_estv_i" translatable="false">i</string>
<string name="display_name_estv_7" translatable="false">+7</string>
<string name="display_name_estv_13" translatable="false">+13</string>
<string name="display_name_estv_18" translatable="false">+18</string>
<string name="description_estv_all">Programas para todos los públicos</string>
<string name="description_estv_i">Programas especialmente recomendados para la infancia</string>
<string name="description_estv_7">Programas no recomendados para menores de 7 años (NR7)</string>
<string name="description_estv_13">Programas no recomendados para menores de 13 años (NR13)</string>
<string name="description_estv_18">Programas no recomendados para menores de 18 años (NR18)</string>
<!-- TV content rating system strings for FI TV -->

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

@@ -66,6 +66,36 @@
<!-- TV content rating system for DK TV -->
<!-- TV content rating system for ES TV -->
<rating-system-definition id="ES_TV"
displayName="@string/display_name_estv"
country="ES">
<rating-definition id="ES_TV_ALL"
displayName="@string/display_name_estv_all"
description="@string/description_estv_all"
ageHint="0" />
<rating-definition id="ES_TV_I"
displayName="@string/display_name_estv_i"
description="@string/description_estv_i"
ageHint="0" />
<rating-definition id="ES_TV_7"
displayName="@string/display_name_estv_7"
description="@string/description_estv_7"
ageHint="7" />
<rating-definition id="ES_TV_13"
displayName="@string/display_name_estv_13"
description="@string/description_estv_13"
ageHint="13" />
<rating-definition id="ES_TV_18"
displayName="@string/display_name_estv_18"
description="@string/description_estv_18"
ageHint="18" />
<order>
<rating id="ES_TV_ALL" />
<rating id="ES_TV_7" />
<rating id="ES_TV_13" />
<rating id="ES_TV_18" />
</order>
</rating-system-definition>
<!-- TV content rating system for FI TV -->

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

@@ -132,10 +132,10 @@ import java.util.List;
* <td>DK_TV</td>
* <td></td>
* </tr-->
* <!--tr>
* <tr>
* <td>ES_TV</td>
* <td></td>
* </tr-->
* <td>The Spanish rating system for television programs</td>
* </tr>
* <!--tr>
* <td>FI_TV</td>
* <td></td>
@@ -345,10 +345,30 @@ import java.util.List;
* <td>DK_TV_ALL</td>
* <td></td>
* </tr-->
* <!--tr>
* <tr>
* <td>ES_TV_ALL</td>
* <td></td>
* </tr-->
* <td>A rating string for {@code ES_TV}. This rating is for programs for all ages.</td>
* </tr>
* <tr>
* <td>ES_TV_I</td>
* <td>A rating string for {@code ES_TV}. This rating is for the recommended programs
* especially for children.</td>
* </tr>
* <tr>
* <td>ES_TV_7</td>
* <td>A rating string for {@code ES_TV}. This rating is for programs not recommended for
* children under 7.</td>
* </tr>
* <tr>
* <td>ES_TV_13</td>
* <td>A rating string for {@code ES_TV}. This rating is for programs not recommended for
* children under 13.</td>
* </tr>
* <tr>
* <td>ES_TV_18</td>
* <td>A rating string for {@code ES_TV}. This rating is for programs not recommended for
* children under 18.</td>
* </tr>
* <!--tr>
* <td>FI_TV_ALL</td>
* <td></td>
@@ -654,10 +674,6 @@ import java.util.List;
* <td></td>
* </tr-->
* <!--tr>
* <td>ES_TV_</td>
* <td></td>
* </tr-->
* <!--tr>
* <td>FI_TV_</td>
* <td></td>
* </tr-->