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

Merge ab/7061308 into stage.

Browse Source 
Bug: 180401296
Merged-In: I4bf82035631ccff6d5a6144d6d9b1d203b076851
Change-Id: I1b5f3a672a55eaabba0f5389bab110b395553559
This commit is contained in:
Xin Li
2021-02-21 09:39:53 -08:00
parent 6cc86364fb 3078660c4e
commit be473bf819
1252 changed files with 26660 additions and 52648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/java/android/graphics/Typeface.java
View File

@@ -327,7 +327,7 @@ public class Typeface {
* 1) Create Typeface from ttf file.
* <pre>
* <code>
* Typeface.Builder buidler = new Typeface.Builder("your_font_file.ttf");
* Typeface.Builder builder = new Typeface.Builder("your_font_file.ttf");
* Typeface typeface = builder.build();
* </code>
* </pre>
@@ -335,7 +335,7 @@ public class Typeface {
* 2) Create Typeface from ttc file in assets directory.
* <pre>
* <code>
* Typeface.Builder buidler = new Typeface.Builder(getAssets(), "your_font_file.ttc");
* Typeface.Builder builder = new Typeface.Builder(getAssets(), "your_font_file.ttc");
* builder.setTtcIndex(2); // Set index of font collection.
* Typeface typeface = builder.build();
* </code>
@@ -344,7 +344,7 @@ public class Typeface {
* 3) Create Typeface with variation settings.
* <pre>
* <code>
* Typeface.Builder buidler = new Typeface.Builder("your_font_file.ttf");
* Typeface.Builder builder = new Typeface.Builder("your_font_file.ttf");
* builder.setFontVariationSettings("'wght' 700, 'slnt' 20, 'ital' 1");
* builder.setWeight(700); // Tell the system that this is a bold font.
* builder.setItalic(true); // Tell the system that this is an italic style font.