diff options
| author | Seigo Nonaka <nona@google.com> | 2018-08-09 14:52:43 -0700 |
|---|---|---|
| committer | Seigo Nonaka <nona@google.com> | 2018-09-05 14:54:12 -0700 |
| commit | c7b3e62f0d9a66c69d2e4b335e77f205826459a9 (patch) | |
| tree | c8b14c659a9d43f868716b2e7237537ddf0f28fb /data/fonts | |
| parent | 900fa92042ba1f1e28280f4df1231b3ede65274d (diff) | |
Introduce system font enumeration API
To be able to use font file in their apps, provides blob and path to the
font file and locale list as well.
Bug: 26116537
Test: atest CtsWidgetTestCases:EditTextTest
CtsWidgetTestCases:TextViewFadingEdgeTest
FrameworksCoreTests:TextViewFallbackLineSpacingTest
FrameworksCoreTests:TextViewTest FrameworksCoreTests:TypefaceTest
CtsGraphicsTestCases:TypefaceTest CtsWidgetTestCases:TextViewTest
CtsTextTestCases FrameworksCoreTests:android.text
CtsWidgetTestCases:TextViewPrecomputedTextTest
CtsGraphicsTestCases:android.graphics.font
Change-Id: I1ae1302c6906b808012e1e91b1e4ab393c887cb6
Diffstat (limited to 'data/fonts')
| -rw-r--r-- | data/fonts/fonts.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml index be9347ab6771..c84c0354a7c4 100644 --- a/data/fonts/fonts.xml +++ b/data/fonts/fonts.xml @@ -137,7 +137,7 @@ <font weight="400" style="normal" fallbackFor="serif">NotoSerifArmenian-Regular.otf</font> <font weight="700" style="normal" fallbackFor="serif">NotoSerifArmenian-Bold.otf</font> </family> - <family lang="und-Geor und-Geok"> + <family lang="und-Geor,und-Geok"> <font weight="400" style="normal">NotoSansGeorgian-Regular.otf</font> <font weight="500" style="normal">NotoSansGeorgian-Medium.otf</font> <font weight="700" style="normal">NotoSansGeorgian-Bold.otf</font> @@ -538,7 +538,7 @@ <font weight="400" style="normal" index="2">NotoSansCJK-Regular.ttc</font> <font weight="400" style="normal" index="2" fallbackFor="serif">NotoSerifCJK-Regular.ttc</font> </family> - <family lang="zh-Hant zh-Bopo"> + <family lang="zh-Hant,zh-Bopo"> <font weight="400" style="normal" index="3">NotoSansCJK-Regular.ttc</font> <font weight="400" style="normal" index="3" fallbackFor="serif">NotoSerifCJK-Regular.ttc</font> </family> |