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

Commit 4abfc99c authored by Jae Seo's avatar Jae Seo Committed by Android Git Automerger
Browse files

am 554f2adf: am f69d30a0: am 3de3e67b: API Review: TV 

* commit '554f2adf5f09f07644ab5f231af7a4751eeb679a':
  API Review: TV
parents f565c356 3220eafa

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,6 @@ 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
@@ -460,6 +459,7 @@ package android { 
    field public static final int configure = 16843357; // 0x101025d

    field public static final int constantSize = 16843158; // 0x1010196

    field public static final int content = 16843355; // 0x101025b

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

    field public static final int contentAuthority = 16843408; // 0x1010290

    field public static final int contentDescription = 16843379; // 0x1010273

    field public static final int contentInsetEnd = 16843860; // 0x1010454

core/res/res/values/attrs.xml

+3 −2
Original line number Diff line number Diff line
@@ -7364,7 +7364,8 @@ 
        <attr name="title" />

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

        <attr name="description" />

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

        <!-- The country code associated with the content rating system, which consists of two

             uppercase letters that conform to the ISO 3166 standard. -->

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

    </declare-styleable>
@@ -7381,7 +7382,7 @@ 
        <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" />

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

    </declare-styleable>



    <declare-styleable name="ResolverDrawerLayout">

core/res/res/values/public.xml

+1 −1
Original line number Diff line number Diff line
@@ -2273,7 +2273,7 @@ 
  <public type="attr" name="letterSpacing" />

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

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

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

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

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

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

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