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

Merge "Move Phags-pa and Yi fonts to the end of fallback chain" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-11 02:08:42 +00:00
committed by Android (Google) Code Review
parent bf3423a939 6f84f86f59
commit 7ffdc86b95
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
data/fonts/fonts.xml
View File

@@ -406,9 +406,6 @@
<family lang="und-Osma"> <family lang="und-Osma">
<font weight="400" style="normal">NotoSansOsmanya-Regular.ttf</font> <font weight="400" style="normal">NotoSansOsmanya-Regular.ttf</font>
</family> </family>
<family lang="und-Phag">
<font weight="400" style="normal">NotoSansPhagsPa-Regular.ttf</font>
</family>
<family lang="und-Phnx"> <family lang="und-Phnx">
<font weight="400" style="normal">NotoSansPhoenician-Regular.ttf</font> <font weight="400" style="normal">NotoSansPhoenician-Regular.ttf</font>
</family> </family>
@@ -468,9 +465,6 @@
<family lang="und-Vaii"> <family lang="und-Vaii">
<font weight="400" style="normal">NotoSansVai-Regular.ttf</font> <font weight="400" style="normal">NotoSansVai-Regular.ttf</font>
</family> </family>
<family lang="und-Yiii">
<font weight="400" style="normal">NotoSansYi-Regular.ttf</font>
</family>
<family> <family>
<font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted.ttf</font> <font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted.ttf</font>
</family> </family>
@@ -494,13 +488,19 @@
<font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted2.ttf</font> <font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted2.ttf</font>
</family> </family>
<!-- <!--
Tai Le and Mongolian are intentionally kept last, to make sure they don't override Tai Le, Yi, Mongolian, and Phags-pa are intentionally kept last, to make sure they don't
the East Asian punctuation for Chinese. override the East Asian punctuation for Chinese.
--> -->
<family lang="und-Tale"> <family lang="und-Tale">
<font weight="400" style="normal">NotoSansTaiLe-Regular.ttf</font> <font weight="400" style="normal">NotoSansTaiLe-Regular.ttf</font>
</family> </family>
<family lang="und-Yiii">
<font weight="400" style="normal">NotoSansYi-Regular.ttf</font>
</family>
<family lang="und-Mong"> <family lang="und-Mong">
<font weight="400" style="normal">NotoSansMongolian-Regular.ttf</font> <font weight="400" style="normal">NotoSansMongolian-Regular.ttf</font>
</family> </family>
<family lang="und-Phag">
<font weight="400" style="normal">NotoSansPhagsPa-Regular.ttf</font>
</family>
</familyset> </familyset>