TIF: Add content ratings for Germany
Change-Id: I7233e5d10550d6e6d2ef6f7c1c4ebd71bc271539
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index e94a046..147e23c 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -4865,6 +4865,15 @@
<!-- TV content rating system strings for CO TV -->
<!-- TV content rating system strings for DE TV -->
+ <string name="display_name_detv" translatable="false">DE-TV</string>
+ <string name="display_name_detv_all" translatable="false">ab 0 Jahren</string>
+ <string name="display_name_detv_12" translatable="false">ab 12 Jahren</string>
+ <string name="display_name_detv_16" translatable="false">ab 16 Jahren</string>
+ <string name="display_name_detv_18" translatable="false">ab 18 Jahren</string>
+ <string name="description_detv_all">Die nachfolgende Sendung ist für alle alters geeignet.</string>
+ <string name="description_detv_12">Die nachfolgende Sendung ist für Zuschauer unter 12 Jahren nicht geeignet.</string>
+ <string name="description_detv_16">Die nachfolgende Sendung ist für Zuschauer unter 16 Jahren nicht geeignet.</string>
+ <string name="description_detv_18">Die nachfolgende Sendung ist für Zuschauer unter 18 Jahren nicht geeignet.</string>
<!-- TV content rating system strings for DK TV -->
diff --git a/core/res/res/xml/tv_content_rating_systems.xml b/core/res/res/xml/tv_content_rating_systems.xml
index 57fd2ad..fc69e34 100644
--- a/core/res/res/xml/tv_content_rating_systems.xml
+++ b/core/res/res/xml/tv_content_rating_systems.xml
@@ -36,6 +36,32 @@
<!-- TV content rating system for CO TV -->
<!-- TV content rating system for DE TV -->
+ <rating-system-definition id="DE_TV"
+ displayName="@string/display_name_detv"
+ country="DE">
+ <rating-definition id="DE_TV_ALL"
+ displayName="@string/display_name_detv_all"
+ description="@string/description_detv_all"
+ ageHint="0" />
+ <rating-definition id="DE_TV_12"
+ displayName="@string/display_name_detv_12"
+ description="@string/description_detv_12"
+ ageHint="12" />
+ <rating-definition id="DE_TV_16"
+ displayName="@string/display_name_detv_16"
+ description="@string/description_detv_16"
+ ageHint="16" />
+ <rating-definition id="DE_TV_18"
+ displayName="@string/display_name_detv_18"
+ description="@string/description_detv_18"
+ ageHint="18" />
+ <order>
+ <rating id="DE_TV_ALL" />
+ <rating id="DE_TV_12" />
+ <rating id="DE_TV_16" />
+ <rating id="DE_TV_18" />
+ </order>
+ </rating-system-definition>
<!-- TV content rating system for DK TV -->
diff --git a/media/java/android/media/tv/TvContentRating.java b/media/java/android/media/tv/TvContentRating.java
index ecf4185..adc2d5f 100644
--- a/media/java/android/media/tv/TvContentRating.java
+++ b/media/java/android/media/tv/TvContentRating.java
@@ -124,10 +124,10 @@
* <td>CO_TV</td>
* <td></td>
* </tr-->
- * <!--tr>
+ * <tr>
* <td>DE_TV</td>
- * <td></td>
- * </tr-->
+ * <td>The Germany television rating system</td>
+ * </tr>
* <!--tr>
* <td>DK_TV</td>
* <td></td>
@@ -316,10 +316,31 @@
* <td>CO_TV_ALL</td>
* <td></td>
* </tr-->
- * <!--tr>
+ * <tr>
* <td>DE_TV_ALL</td>
- * <td></td>
- * </tr-->
+ * <td>Without restriction. There are time schedules and certain age groups which have to be
+ * considered. {@code DE_TV_ALL} is scheduled in daytime (6:00AM – 8:00PM). However, cinema
+ * films classified with "12" may be shown during the daytime, if they are not considered
+ * harmful to younger children.</td>
+ * </tr>
+ * <tr>
+ * <td>DE_TV_12</td>
+ * <td>Suitable for 12 years and above. There are time schedules and certain age groups
+ * which have to be considered. {@code DE_TV_12} is scheduled in primetime (from 8:00PM
+ * – 10.00 p.m.).</td>
+ * </tr>
+ * <tr>
+ * <td>DE_TV_16</td>
+ * <td>Suitable for 16 years and above. There are time schedules and certain age groups
+ * which have to be considered. {@code DE_TV_16} is scheduled in late evening (from 10:00PM
+ * - 11:00PM). </td>
+ * </tr>
+ * <tr>
+ * <td>DE_TV_18</td>
+ * <td>Suitable for 18 years and above. There are time schedules and certain age groups
+ * which have to be considered. {@code DE_TV_18} is scheduled in late night (from 11:00PM
+ * - 6:00AM). </td>
+ * </tr>
* <!--tr>
* <td>DK_TV_ALL</td>
* <td></td>
@@ -582,10 +603,6 @@
* <td></td>
* </tr-->
* <!--tr>
- * <td>DE_TV_</td>
- * <td></td>
- * </tr-->
- * <!--tr>
* <td>DK_TV_</td>
* <td></td>
* </tr-->
@@ -598,10 +615,6 @@
* <td></td>
* </tr-->
* <!--tr>
- * <td>FR_TV_</td>
- * <td></td>
- * </tr-->
- * <!--tr>
* <td>GR_TV_</td>
* <td></td>
* </tr-->