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

Merge "Fix bold italic docs"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-12-19 17:33:25 +00:00
committed by Android (Google) Code Review
parent beef470baf 686109ec61
commit a400718ab5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4442,7 +4442,7 @@
<attr name="textColor" />
<!-- Size of the text. Recommended dimension type for text is "sp" for scaled-pixels (example: 15sp). -->
<attr name="textSize" />
<!-- Style (bold, italic, bolditalic) for the text. -->
<!-- Style (normal, bold, italic, bold|italic) for the text. -->
<attr name="textStyle" />
<!-- Typeface (normal, sans, serif, monospace) for the text. -->
<attr name="typeface" />
@@ -4527,7 +4527,7 @@
<attr name="textScaleX" format="float" />
<!-- Typeface (normal, sans, serif, monospace) for the text. -->
<attr name="typeface" />
<!-- Style (bold, italic, bolditalic) for the text. -->
<!-- Style (normal, bold, italic, bold|italic) for the text. -->
<attr name="textStyle" />
<!-- Font family (named by string or as a font resource reference) for the text. -->
<attr name="fontFamily" />