diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 479c5ff4036df..1906fb85586d0 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -4865,6 +4865,15 @@ + DE-TV + ab 0 Jahren + ab 12 Jahren + ab 16 Jahren + ab 18 Jahren + Die nachfolgende Sendung ist für alle alters geeignet. + Die nachfolgende Sendung ist für Zuschauer unter 12 Jahren nicht geeignet. + Die nachfolgende Sendung ist für Zuschauer unter 16 Jahren nicht geeignet. + Die nachfolgende Sendung ist für Zuschauer unter 18 Jahren nicht geeignet. diff --git a/core/res/res/xml/tv_content_rating_systems.xml b/core/res/res/xml/tv_content_rating_systems.xml index c174c62d91e12..420fc2b5d42f8 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 @@ + + + + + + + + + + + + diff --git a/media/java/android/media/tv/TvContentRating.java b/media/java/android/media/tv/TvContentRating.java index bca66473f068e..0d4db8d30c7e6 100644 --- a/media/java/android/media/tv/TvContentRating.java +++ b/media/java/android/media/tv/TvContentRating.java @@ -124,10 +124,10 @@ import java.util.List; * CO_TV * * - * + * The Germany television rating system + * * - * + * 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. + * + * + * DE_TV_12 + * 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.). + * + * + * DE_TV_16 + * 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). + * + * + * DE_TV_18 + * 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). + * * * - * @@ -624,10 +641,6 @@ import java.util.List; * * * - *