Merge "TIF: Add content ratings for Netherlands" into lmp-dev (8811f345) · Commits · e / os / android_frameworks_base

core/res/res/values/strings.xml

+23 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4934,6 +4934,29 @@
	<!-- TV content rating system strings for MY TV -->		<!-- TV content rating system strings for MY TV -->

	<!-- TV content rating system strings for NL TV -->		<!-- TV content rating system strings for NL TV -->
			<string name="display_name_nltv" translatable="false">NL-TV</string>
			<string name="display_name_nltv_v" translatable="false">Geweld</string>
			<string name="display_name_nltv_f" translatable="false">Angst</string>
			<string name="display_name_nltv_s" translatable="false">Seks</string>
			<string name="display_name_nltv_d" translatable="false">Discriminatie</string>
			<string name="display_name_nltv_da" translatable="false">Drugs- en/of alcoholmisbruik</string>
			<string name="display_name_nltv_l" translatable="false">Grof taalgebruik</string>
			<string name="display_name_nltv_al" translatable="false">Alle leeftijden</string>
			<string name="display_name_nltv_6" translatable="false">Let op met kinderen tot 6 jaar</string>
			<string name="display_name_nltv_9" translatable="false">Let op met kinderen tot 9 jaar</string>
			<string name="display_name_nltv_12" translatable="false">Let op met kinderen tot 12 jaar</string>
			<string name="display_name_nltv_16" translatable="false">Let op met kinderen tot 16 jaar</string>
			<string name="description_nltv_v">Geweld</string>
			<string name="description_nltv_f">Angst</string>
			<string name="description_nltv_s">Seks</string>
			<string name="description_nltv_d">Discriminatie</string>
			<string name="description_nltv_da">Drugs- en/of alcoholmisbruik</string>
			<string name="description_nltv_l">Grof taalgebruik</string>
			<string name="description_nltv_al">De leeftijdscategorie Alle Leeftijden geeft aan dat een mediaproductie geen schadelijke elementen bevat.</string>
			<string name="description_nltv_6">Mogelijk schadelijk voor kinderen onder de 6 jaar.</string>
			<string name="description_nltv_9">Mogelijk schadelijk voor kinderen onder de 9 jaar.</string>
			<string name="description_nltv_12">Mogelijk schadelijk voor kinderen onder de 12 jaar.</string>
			<string name="description_nltv_16">Mogelijk schadelijk voor kinderen onder de 16 jaar.</string>

	<!-- TV content rating system strings for NZ TV -->		<!-- TV content rating system strings for NZ TV -->

core/res/res/xml/tv_content_rating_systems.xml

+86 −0

Original line number	Original line	Diff line number	Diff line
	@@ -166,6 +166,92 @@
	<!-- TV content rating system for MY TV -->		<!-- TV content rating system for MY TV -->

	<!-- TV content rating system for NL TV -->		<!-- TV content rating system for NL TV -->
			<rating-system-definition id="NL_TV"
			displayName="@string/display_name_nltv"
			country="NL">
			<sub-rating-definition id="NL_TV_V"
			displayName="@string/display_name_nltv_v"
			description="@string/description_nltv_v" />
			<sub-rating-definition id="NL_TV_F"
			displayName="@string/display_name_nltv_f"
			description="@string/description_nltv_f" />
			<sub-rating-definition id="NL_TV_S"
			displayName="@string/display_name_nltv_s"
			description="@string/description_nltv_s" />
			<sub-rating-definition id="NL_TV_D"
			displayName="@string/display_name_nltv_d"
			description="@string/description_nltv_d" />
			<sub-rating-definition id="NL_TV_DA"
			displayName="@string/display_name_nltv_da"
			description="@string/description_nltv_da" />
			<sub-rating-definition id="NL_TV_L"
			displayName="@string/display_name_nltv_l"
			description="@string/description_nltv_l" />

			<rating-definition id="NL_TV_AL"
			displayName="@string/display_name_nltv_al"
			description="@string/description_nltv_al"
			ageHint="0">
			<sub-rating id="NL_TV_V" />
			<sub-rating id="NL_TV_F" />
			<sub-rating id="NL_TV_S" />
			<sub-rating id="NL_TV_D" />
			<sub-rating id="NL_TV_DA" />
			<sub-rating id="NL_TV_L" />
			</rating-definition>
			<rating-definition id="NL_TV_6"
			displayName="@string/display_name_nltv_6"
			description="@string/description_nltv_6"
			ageHint="6">
			<sub-rating id="NL_TV_V" />
			<sub-rating id="NL_TV_F" />
			<sub-rating id="NL_TV_S" />
			<sub-rating id="NL_TV_D" />
			<sub-rating id="NL_TV_DA" />
			<sub-rating id="NL_TV_L" />
			</rating-definition>
			<rating-definition id="NL_TV_9"
			displayName="@string/display_name_nltv_9"
			description="@string/description_nltv_9"
			ageHint="9">
			<sub-rating id="NL_TV_V" />
			<sub-rating id="NL_TV_F" />
			<sub-rating id="NL_TV_S" />
			<sub-rating id="NL_TV_D" />
			<sub-rating id="NL_TV_DA" />
			<sub-rating id="NL_TV_L" />
			</rating-definition>
			<rating-definition id="NL_TV_12"
			displayName="@string/display_name_nltv_12"
			description="@string/description_nltv_12"
			ageHint="12">
			<sub-rating id="NL_TV_V" />
			<sub-rating id="NL_TV_F" />
			<sub-rating id="NL_TV_S" />
			<sub-rating id="NL_TV_D" />
			<sub-rating id="NL_TV_DA" />
			<sub-rating id="NL_TV_L" />
			</rating-definition>
			<rating-definition id="NL_TV_16"
			displayName="@string/display_name_nltv_16"
			description="@string/description_nltv_16"
			ageHint="16">
			<sub-rating id="NL_TV_V" />
			<sub-rating id="NL_TV_F" />
			<sub-rating id="NL_TV_S" />
			<sub-rating id="NL_TV_D" />
			<sub-rating id="NL_TV_DA" />
			<sub-rating id="NL_TV_L" />
			</rating-definition>

			<order>
			<rating id="NL_TV_AL" />
			<rating id="NL_TV_6" />
			<rating id="NL_TV_9" />
			<rating id="NL_TV_12" />
			<rating id="NL_TV_16" />
			</order>
			</rating-system-definition>

	<!-- TV content rating system for NZ TV -->		<!-- TV content rating system for NZ TV -->

media/java/android/media/tv/TvContentRating.java

+52 −11

Original line number	Original line	Diff line number	Diff line
	@@ -200,10 +200,10 @@ import java.util.List;
	* <td>MY_TV</td>		* <td>MY_TV</td>
	* <td></td>		* <td></td>
	* </tr-->		* </tr-->
	* <!--tr>		* <tr>
	* <td>NL_TV</td>		* <td>NL_TV</td>
	* <td></td>		* <td>The television rating system in the Netherlands</td>
	* </tr-->		* </tr>
	* <!--tr>		* <!--tr>
	* <td>NZ_TV</td>		* <td>NZ_TV</td>
	* <td></td>		* <td></td>
	@@ -463,10 +463,31 @@ import java.util.List;
	* <td>MY_TV_ALL</td>		* <td>MY_TV_ALL</td>
	* <td></td>		* <td></td>
	* </tr-->		* </tr-->
	* <!--tr>		* <tr>
	* <td>NL_TV_ALL</td>		* <td>NL_TV_AL</td>
	* <td></td>		* <td>A rating string for {@code NL_TV}. This rating is for programs that are appropriate
	* </tr-->		* for all ages.</td>
			* </tr>
			* <tr>
			* <td>NL_TV_6</td>
			* <td>A rating string for {@code NL_TV}. This rating is for programs that require parental
			* advisory for children under 6.</td>
			* </tr>
			* <tr>
			* <td>NL_TV_9</td>
			* <td>A rating string for {@code NL_TV}. This rating is for programs that require parental
			* advisory for children under 9.</td>
			* </tr>
			* <tr>
			* <td>NL_TV_12</td>
			* <td>A rating string for {@code NL_TV}. This rating is for programs that require parental
			* advisory for children under 12.</td>
			* </tr>
			* <tr>
			* <td>NL_TV_16</td>
			* <td>A rating string for {@code NL_TV}. This rating is for programs that require parental
			* advisory for children under 16.</td>
			* </tr>
	* <!--tr>		* <!--tr>
	* <td>NZ_TV_ALL</td>		* <td>NZ_TV_ALL</td>
	* <td></td>		* <td></td>
	@@ -692,10 +713,30 @@ import java.util.List;
	* <td>MY_TV_</td>		* <td>MY_TV_</td>
	* <td></td>		* <td></td>
	* </tr-->		* </tr-->
	* <!--tr>		* <tr>
	* <td>NL_TV_</td>		* <td>NL_TV_V</td>
	* <td></td>		* <td>Violence</td>
	* </tr-->		* </tr>
			* <tr>
			* <td>NL_TV_F</td>
			* <td>Fear</td>
			* </tr>
			* <tr>
			* <td>NL_TV_S</td>
			* <td>Sex</td>
			* </tr>
			* <tr>
			* <td>NL_TV_D</td>
			* <td>Discrimination</td>
			* </tr>
			* <tr>
			* <td>NL_TV_DA</td>
			* <td>Drugs- and alcoholabuse</td>
			* </tr>
			* <tr>
			* <td>NL_TV_L</td>
			* <td>Coarse Language</td>
			* </tr>
	* <!--tr>		* <!--tr>
	* <td>NZ_TV_</td>		* <td>NZ_TV_</td>
	* <td></td>		* <td></td>