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

Commit c1ab3a99 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "docs: Javadoc fixes am: 42be03df am: 55496c76"

parents bc6a68cd 6a1121e2
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -6034,7 +6034,7 @@
        <attr name="insetBottom" format="fraction|dimension" />
    </declare-styleable>

    <!-- Drawable used to draw animated images (gif) -->
    <!-- Drawable used to draw animated images (gif). -->
    <declare-styleable name="AnimatedImageDrawable">
        <!-- Identifier of the image file. This attribute is mandatory.
             It must be an image file with multiple frames, e.g. gif or webp -->
@@ -8918,8 +8918,8 @@
        <attr name="name" />
    </declare-styleable>

    <!-- Attributes that are read when parsing a <font> tag, which is a child of
         <font-family>. This represents an actual font file and its attributes. -->
    <!-- Attributes that are read when parsing a &lt;font&gt; tag, which is a child of
         &lt;font-family&gt;. This represents an actual font file and its attributes. -->
    <declare-styleable name="FontFamilyFont">
        <!-- The style of the given font file. This will be used when the font is being loaded into
         the font stack and will override any style information in the font's header tables. If
@@ -8950,7 +8950,7 @@
        <attr name="fontVariationSettings" format="string" />
    </declare-styleable>

    <!-- Attributes that are read when parsing a <fontfamily> tag. -->
    <!-- Attributes that are read when parsing a &lt;fontfamily&gt; tag. -->
    <declare-styleable name="FontFamily">
        <!-- The authority of the Font Provider to be used for the request. -->
        <attr name="fontProviderAuthority" format="string" />