diff options
| author | 2017-12-19 17:33:25 +0000 | |
|---|---|---|
| committer | 2017-12-19 17:33:25 +0000 | |
| commit | a400718ab5a75b698dfbb947b1373520335a89c2 (patch) | |
| tree | 91249a351c44f14fd55bf5a479c42afb150b43ec | |
| parent | beef470baf1d8bdc6d451616638ba2e400b61992 (diff) | |
| parent | 686109ec612039960334b896bbac07191e3de826 (diff) | |
Merge "Fix bold italic docs"
| -rw-r--r-- | core/res/res/values/attrs.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 567de1efd659..64febf1f7ee4 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -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" /> |