Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0bcee49 authored by Sungsoo Lim's avatar Sungsoo Lim Committed by Android (Google) Code Review
Browse files

Merge "TIF: Add content ratings for France" into lmp-dev

parents e377ea5d 4acc7c3f

core/res/res/values/strings.xml

+11 −0
Original line number Diff line number Diff line
@@ -4873,6 +4873,17 @@ 
    <!-- TV content rating system strings for FI TV -->



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

    <string name="display_name_frtv" translatable="false">FR-TV</string>

    <string name="display_name_frtv_all" translatable="false">Les programmes tous publics</string>

    <string name="display_name_frtv_10" translatable="false">Déconseillé aux -10 ans</string>

    <string name="display_name_frtv_12" translatable="false">Déconseillé aux -12 ans</string>

    <string name="display_name_frtv_16" translatable="false">Déconseillé aux -16 ans</string>

    <string name="display_name_frtv_18" translatable="false">Déconseillé aux -18 ans</string>

    <string name="description_frtv_all">Les programmes tous publics</string>

    <string name="description_frtv_10">Programmes comportant certaines scènes susceptibles de heurter les -10 ans.</string>

    <string name="description_frtv_12">Programmes pouvant troubler les -12 ans, notamment lorsque le scénario recourt de façon systématique et répétée à la violence physique ou psychologique.</string>

    <string name="description_frtv_16">Programmes à caractère érotique ou de grande violence, susceptibles de nuire à l’épanouissement physique, mental ou moral des -16 ans.</string>

    <string name="description_frtv_18">Programmes pornographiques ou de très grande violence, réservés à un public adulte averti et susceptibles de nuire à l’épanouissement physique, mental ou moral des -18 ans.</string>



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

core/res/res/xml/tv_content_rating_systems.xml

+35 −0
Original line number Diff line number Diff line
@@ -44,6 +44,41 @@ 
    <!-- TV content rating system for FI TV -->



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

    <rating-system-definition id="FR_TV"

        displayName="@string/display_name_frtv"

        country="FR">

        <rating-definition id="FR_TV_ALL"

            displayName="@string/display_name_frtv_all"

            description="@string/description_frtv_all"

            ageHint="0" />

        <rating-definition id="FR_TV_10"

            displayName="@string/display_name_frtv_10"

            description="@string/description_frtv_10"

            ageHint="10">

        </rating-definition>

        <rating-definition id="FR_TV_12"

            displayName="@string/display_name_frtv_12"

            description="@string/description_frtv_12"

            ageHint="12">

        </rating-definition>

        <rating-definition id="FR_TV_16"

            displayName="@string/display_name_frtv_16"

            description="@string/description_frtv_16"

            ageHint="16">

        </rating-definition>

        <rating-definition id="FR_TV_18"

            displayName="@string/display_name_frtv_18"

            description="@string/description_frtv_18"

            ageHint="18">

        </rating-definition>

        <order>

            <rating id="FR_TV_ALL" />

            <rating id="FR_TV_10" />

            <rating id="FR_TV_12" />

            <rating id="FR_TV_16" />

            <rating id="FR_TV_18" />

        </order>

    </rating-system-definition>



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

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

+32 −6
Original line number Diff line number Diff line
@@ -140,10 +140,10 @@ import java.util.List; 
 *         <td>FI_TV</td>

 *         <td></td>

 *     </tr-->

 *     <!--tr>

 *     <tr>

 *         <td>FR_TV</td>

 *         <td></td>

 *     </tr-->

 *         <td>The content rating system in French</td>

 *     </tr>

 *     <!--tr>

 *         <td>GR_TV</td>

 *         <td></td>
@@ -332,10 +332,36 @@ import java.util.List; 
 *         <td>FI_TV_ALL</td>

 *         <td></td>

 *     </tr-->

 *     <!--tr>

 *     <tr>

 *         <td>FR_TV_ALL</td>

 *         <td></td>

 *     </tr-->

 *         <td>A rating string for {@code FR_TV}. According to CSA in France, if no rating appears,

 *         the program is most likely appropriate for all ages. In Android TV, however,

 *         {@code RATING_FR_ALL} is used for handling that case.</td>

 *     </tr>

 *     <tr>

 *         <td>FR_TV_10</td>

 *         <td>A rating string for {@code FR_TV}. This rating is for programs that are not

 *         recommended for children under 10.</td>

 *     </tr>

 *     <tr>

 *         <td>FR_TV_12</td>

 *         <td>A rating string for {@code FR_TV}. This rating is for programs that are not

 *         recommended for children under 12. Programs rated this are not allowed to air before

 *         10:00 pm (Some channels and programs are subject to exception). </td>

 *     </tr>

 *     <tr>

 *         <td>FR_TV_16</td>

 *         <td>A rating string for {@code FR_TV}. This rating is for programs that are not

 *         recommended for children under 16. Programs rated this are not allowed to air before

 *         10:30 pm (Some channels and programs are subject to exception). </td>

 *     </tr>

 *     <tr>

 *         <td>FR_TV_18</td>

 *         <td>A rating string for {@code FR_TV}.  This rating is for programs that are not

 *         recommended for persons under 18. Programs rated this are allowed between midnight and

 *         5 am and only on some channels. The access to these programs is locked by a personal

 *         password.</td>

 *     </tr>

 *     <!--tr>

 *         <td>GR_TV_ALL</td>

 *         <td></td>