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

am c8640fca: Merge "Add 8 more scripts to the font fallback chain." into lmp-mr1-dev

Browse Source 
* commit 'c8640fca7862fee5e156fa634c1cdf7853115595':
  Add 8 more scripts to the font fallback chain.
This commit is contained in:
Raph Levien
2014-12-05 07:33:47 +00:00
committed by Android Git Automerger
parent bfc9739b1c c8640fca78
commit 1a7bac35da
2 changed files with 66 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
data/fonts/fallback_fonts.xml
View File

@@ -227,6 +227,12 @@
<file>NotoSansThaana-Bold.ttf</file>
</fileset>
</family>
<family>
<fileset>
<file>NotoSansCham-Regular.ttf</file>
<file>NotoSansCham-Bold.ttf</file>
</fileset>
</family>
<family>
<fileset>
<file>NotoSansBalinese-Regular.ttf</file>
@@ -257,6 +263,16 @@
<file>NotoSansCherokee-Regular.ttf</file>
</fileset>
</family>
<family>
<fileset>
<file>NotoSansCoptic-Regular.ttf</file>
</fileset>
</family>
<family>
<fileset>
<file>NotoSansGlagolitic-Regular.ttf</file>
</fileset>
</family>
<family>
<fileset>
<file>NotoSansHanunoo-Regular.ttf</file>
@@ -267,6 +283,11 @@
<file>NotoSansJavanese-Regular.ttf</file>
</fileset>
</family>
<family>
<fileset>
<file>NotoSansKayahLi-Regular.ttf</file>
</fileset>
</family>
<family>
<fileset>
<file>NotoSansLepcha-Regular.ttf</file>
@@ -312,6 +333,26 @@
<file>NotoSansTagbanwa-Regular.ttf</file>
</fileset>
</family>
<family>
<fileset>
<file>NotoSansTaiLe-Regular.ttf</file>
</fileset>
</family>
<family>
<fileset>
<file>NotoSansTaiTham-Regular.ttf</file>
</fileset>
</family>
<family>
<fileset>
<file>NotoSansTaiViet-Regular.ttf</file>
</fileset>
</family>
<family>
<fileset>
<file>NotoSansTifinagh-Regular.ttf</file>
</fileset>
</family>
<family>
<fileset>
<file>NotoSansYi-Regular.ttf</file>

25
data/fonts/fonts.xml
View File

@@ -223,6 +223,10 @@
<font weight="400" style="normal">NotoSansThaana-Regular.ttf</font>
<font weight="700" style="normal">NotoSansThaana-Bold.ttf</font>
</family>
<family>
<font weight="400" style="normal">NotoSansCham-Regular.ttf</font>
<font weight="700" style="normal">NotoSansCham-Bold.ttf</font>
</family>
<family>
<font weight="400" style="normal">NotoSansBalinese-Regular.ttf</font>
</family>
@@ -241,12 +245,21 @@
<family>
<font weight="400" style="normal">NotoSansCherokee-Regular.ttf</font>
</family>
<family>
<font weight="400" style="normal">NotoSansCoptic-Regular.ttf</font>
</family>
<family>
<font weight="400" style="normal">NotoSansGlagolitic-Regular.ttf</font>
</family>
<family>
<font weight="400" style="normal">NotoSansHanunoo-Regular.ttf</font>
</family>
<family>
<font weight="400" style="normal">NotoSansJavanese-Regular.ttf</font>
</family>
<family>
<font weight="400" style="normal">NotoSansKayahLi-Regular.ttf</font>
</family>
<family>
<font weight="400" style="normal">NotoSansLepcha-Regular.ttf</font>
</family>
@@ -274,6 +287,18 @@
<family>
<font weight="400" style="normal">NotoSansTagbanwa-Regular.ttf</font>
</family>
<family>
<font weight="400" style="normal">NotoSansTaiLe-Regular.ttf</font>
</family>
<family>
<font weight="400" style="normal">NotoSansTaiTham-Regular.ttf</font>
</family>
<family>
<font weight="400" style="normal">NotoSansTaiViet-Regular.ttf</font>
</family>
<family>
<font weight="400" style="normal">NotoSansTifinagh-Regular.ttf</font>
</family>
<family>
<font weight="400" style="normal">NotoSansYi-Regular.ttf</font>
</family>