Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "docs: Javadoc fixes am: 42be03df6a am: 55496c767c"

Browse Source
This commit is contained in:
Android Build Merger (Role)
2018-12-06 19:12:27 +00:00
committed by Android (Google) Code Review
parent bc6a68cd08 6a1121e27f
commit c1ab3a999c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/res/res/values/attrs.xml
View File

@@ -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" />