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

Commit 14355950 authored by Jae Seo's avatar Jae Seo
Browse files

API Review: android.media.tv 

TvContentRating:
- The XML file: attributes should have android: prefix and should allow
  string resource references for labels.

Bug: 17114406
Change-Id: Ife2f4dc6c2c8a5a1714cdeedb27aab40fce73e2b
parent 635bc8bc

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ package android { 
    field public static final int addStatesFromChildren = 16842992; // 0x10100f0

    field public static final int adjustViewBounds = 16843038; // 0x101011e

    field public static final int advancedPrintOptionsActivity = 16843761; // 0x10103f1

    field public static final int ageHint = 16843962; // 0x10104ba

    field public static final int alertDialogIcon = 16843605; // 0x1010355

    field public static final int alertDialogStyle = 16842845; // 0x101005d

    field public static final int alertDialogTheme = 16843529; // 0x1010309
@@ -467,6 +468,7 @@ package android { 
    field public static final int controlX2 = 16843800; // 0x1010418

    field public static final int controlY1 = 16843799; // 0x1010417

    field public static final int controlY2 = 16843801; // 0x1010419

    field public static final int country = 16843963; // 0x10104bb

    field public static final int cropToPadding = 16843043; // 0x1010123

    field public static final int cursorVisible = 16843090; // 0x1010152

    field public static final int customNavigationLayout = 16843474; // 0x10102d2

core/res/res/values/attrs.xml

+31 −1
Original line number Diff line number Diff line
@@ -7292,7 +7292,7 @@ 
        <attr name="colorPrimary" />

    </declare-styleable>



    <!-- Use <code>tv-input</code> as the root tag of the XML resource that describes an

    <!-- Use <code>tv-input</code> as the root tag of the XML resource that describes a

         {@link android.media.tv.TvInputService}, which is referenced from its

         {@link android.media.tv.TvInputService#SERVICE_META_DATA} meta-data entry.

         Described here are the attributes that can be included in that tag. -->
@@ -7307,6 +7307,36 @@ 
        <attr name="tvContentRatingDescription" format="reference" />

    </declare-styleable>



    <!-- Attributes that can be used with <code>rating-system-definition</code> tags inside of the

         XML resource that describes TV content rating of a

         {@link android.media.tv.TvInputService}, which is referenced from

         {@link android.R.attr#tvContentRatingDescription}. -->

    <declare-styleable name="RatingSystemDefinition">

        <!-- The unique name of the content rating system. -->

        <attr name="name" />

        <!-- The title of the content rating system which is shown to the user. -->

        <attr name="title" />

        <!-- The short description of the content rating system. -->

        <attr name="description" />

        <!-- The country associated with the content rating system. -->

        <attr name="country" format="string" />

    </declare-styleable>



    <!-- Attributes that can be used with <code>rating-definition</code> tags inside of the XML

         resource that describes TV content rating of a {@link android.media.tv.TvInputService},

         which is referenced from {@link android.R.attr#tvContentRatingDescription}. -->

    <declare-styleable name="RatingDefinition">

        <!-- The unique name of the content rating. -->

        <attr name="name" />

        <!-- The title of the content rating which is shown to the user. -->

        <attr name="title" />

        <!-- The short description of the content rating. -->

        <attr name="description" />

        <!-- The age associated with the content rating. The content of this rating is suitable for

             people of this age or above. -->

        <attr name="ageHint" format="integer" />

    </declare-styleable>



    <declare-styleable name="ResolverDrawerLayout">

        <attr name="maxWidth" />

        <attr name="maxCollapsedHeight" format="dimension" />

core/res/res/values/public.xml

+2 −0
Original line number Diff line number Diff line
@@ -2273,6 +2273,8 @@ 
  <public type="attr" name="letterSpacing" />

  <public type="attr" name="fontFeatureSettings" />

  <public type="attr" name="outlineProvider" />

  <public type="attr" name="ageHint" />

  <public type="attr" name="country" />



  <public-padding type="dimen" name="l_resource_pad" end="0x01050010" />

core/res/res/values/strings.xml

+0 −652

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -1266,7 +1266,6 @@ 
  <java-symbol type="xml" name="audio_assets" />

  <java-symbol type="xml" name="global_keys" />

  <java-symbol type="xml" name="default_zen_mode_config" />

  <java-symbol type="xml" name="tv_content_rating_systems" />



  <java-symbol type="raw" name="color_fade_vert" />

  <java-symbol type="raw" name="color_fade_frag" />