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

am 73d2f160: Merge "Move NotoSansSymbols higher than CJK in the fallback chain." into mnc-dev

Browse Source 
* commit '73d2f160ecdd0e00b805fd956abc88996758e516':
  Move NotoSansSymbols higher than CJK in the fallback chain.
This commit is contained in:
Roozbeh Pournader
2015-06-04 23:54:15 +00:00
committed by Android Git Automerger
parent 37750c2811 73d2f160ec
commit 946e869807
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/fonts/fallback_fonts.xml
View File

@@ -405,6 +405,11 @@
<file>NotoSansYi-Regular.ttf</file> <file>NotoSansYi-Regular.ttf</file>
</fileset> </fileset>
</family> </family>
<family>
<fileset>
<file>NotoSansSymbols-Regular-Subsetted.ttf</file>
</fileset>
</family>
<family> <family>
<fileset> <fileset>
<file lang="zh-Hans">NotoSansSC-Regular.otf</file> <file lang="zh-Hans">NotoSansSC-Regular.otf</file>
@@ -430,11 +435,6 @@
<file>NanumGothic.ttf</file> <file>NanumGothic.ttf</file>
</fileset> </fileset>
</family> </family>
<family>
<fileset>
<file>NotoSansSymbols-Regular-Subsetted.ttf</file>
</fileset>
</family>
<family> <family>
<fileset> <fileset>
<file>NotoColorEmoji.ttf</file> <file>NotoColorEmoji.ttf</file>

6
data/fonts/fonts.xml
View File

@@ -331,6 +331,9 @@
<family> <family>
<font weight="400" style="normal">NotoSansYi-Regular.ttf</font> <font weight="400" style="normal">NotoSansYi-Regular.ttf</font>
</family> </family>
<family>
<font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted.ttf</font>
</family>
<family lang="zh-Hans"> <family lang="zh-Hans">
<font weight="400" style="normal">NotoSansSC-Regular.otf</font> <font weight="400" style="normal">NotoSansSC-Regular.otf</font>
</family> </family>
@@ -346,9 +349,6 @@
<family> <family>
<font weight="400" style="normal">NanumGothic.ttf</font> <font weight="400" style="normal">NanumGothic.ttf</font>
</family> </family>
<family>
<font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted.ttf</font>
</family>
<family> <family>
<font weight="400" style="normal">NotoColorEmoji.ttf</font> <font weight="400" style="normal">NotoColorEmoji.ttf</font>
</family> </family>