diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-01-04 16:25:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-04 16:25:13 +0000 |
| commit | ec397abf931a39ed1c3d36f0af4ee9a68b883b07 (patch) | |
| tree | eb166d4f850bc9d7f3ae841c96a74e2c438e7b2a | |
| parent | 7490c5cbe4cce69f36956b5fbe7061be1c6381f6 (diff) | |
| parent | e72b5c5163d2928c61850e60f422aaf960ed2675 (diff) | |
Merge "Update the ttc index attribute documentation"
| -rw-r--r-- | core/res/res/values/attrs.xml | 7 | ||||
| -rw-r--r-- | graphics/java/android/graphics/Typeface.java | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 64febf1f7ee4..1b3d6ce36247 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -8699,8 +8699,11 @@ common values are 400 for regular weight and 700 for bold weight. If unspecified, the value in the font's header tables will be used. --> <attr name="fontWeight" format="integer" /> - <!-- The index of the font in the tcc font file. If the font file referenced is not in the - tcc format, this attribute needs not be specified. --> + <!-- The index of the font in the ttc (TrueType Collection) font file. If the font file + referenced is not in the ttc format, this attribute needs not be specified. + {@see android.graphics.Typeface#Builder.setTtcIndex(int)}. + The default value is 0. More details about the TrueType Collection font format can be found + here: https://en.wikipedia.org/wiki/TrueType#TrueType_Collection. --> <attr name="ttcIndex" format="integer" /> <!-- The variation settings to be applied to the font. The string should be in the following format: "'tag1' value1, 'tag2' value2, ...". If the default variation settings should be diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java index 3d65bd226faf..68b7ac287e98 100644 --- a/graphics/java/android/graphics/Typeface.java +++ b/graphics/java/android/graphics/Typeface.java @@ -429,7 +429,7 @@ public class Typeface { } /** - * Sets an index of the font collection. + * Sets an index of the font collection. See {@link android.R.attr#ttcIndex}. * * Can not be used for Typeface source. build() method will return null for invalid index. * @param ttcIndex An index of the font collection. If the font source is not font |