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

am 03340feb: Merge "Update Naskh font names to match upstream and add Tibetan." into mnc-dev

Browse Source 
* commit '03340feb335f497a5e2d52d1f86a05ecc9dcfcb1':
  Update Naskh font names to match upstream and add Tibetan.
This commit is contained in:
Roozbeh Pournader
2015-05-19 16:40:35 +00:00
committed by Android Git Automerger
parent 0a5db3e2c7 03340feb33
commit eaf3f545c7
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
data/fonts/fallback_fonts.xml
View File

@@ -35,14 +35,14 @@
<familyset>
<family>
<fileset>
<file variant="elegant">NotoNaskh-Regular.ttf</file>
<file variant="elegant">NotoNaskh-Bold.ttf</file>
<file variant="elegant">NotoNaskhArabic-Regular.ttf</file>
<file variant="elegant">NotoNaskhArabic-Bold.ttf</file>
</fileset>
</family>
<family>
<fileset>
<file variant="compact">NotoNaskhUI-Regular.ttf</file>
<file variant="compact">NotoNaskhUI-Bold.ttf</file>
<file variant="compact">NotoNaskhArabicUI-Regular.ttf</file>
<file variant="compact">NotoNaskhArabicUI-Bold.ttf</file>
</fileset>
</family>
<family>
@@ -385,6 +385,11 @@
<file>NotoSansTaiViet-Regular.ttf</file>
</fileset>
</family>
<family>
<fileset>
<file>NotoSansTibetan-Regular.ttf</file>
</fileset>
</family>
<family>
<fileset>
<file>NotoSansTifinagh-Regular.ttf</file>

11
data/fonts/fonts.xml
View File

@@ -94,12 +94,12 @@
<!-- fallback fonts -->
<family variant="elegant">
<font weight="400" style="normal">NotoNaskh-Regular.ttf</font>
<font weight="700" style="normal">NotoNaskh-Bold.ttf</font>
<font weight="400" style="normal">NotoNaskhArabic-Regular.ttf</font>
<font weight="700" style="normal">NotoNaskhArabic-Bold.ttf</font>
</family>
<family variant="compact">
<font weight="400" style="normal">NotoNaskhUI-Regular.ttf</font>
<font weight="700" style="normal">NotoNaskhUI-Bold.ttf</font>
<font weight="400" style="normal">NotoNaskhArabicUI-Regular.ttf</font>
<font weight="700" style="normal">NotoNaskhArabicUI-Bold.ttf</font>
</family>
<family>
<font weight="400" style="normal">NotoSansEthiopic-Regular.ttf</font>
@@ -319,6 +319,9 @@
<family>
<font weight="400" style="normal">NotoSansTaiViet-Regular.ttf</font>
</family>
<family>
<font weight="400" style="normal">NotoSansTibetan-Regular.ttf</font>
</family>
<family>
<font weight="400" style="normal">NotoSansTifinagh-Regular.ttf</font>
</family>