summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorRoozbeh Pournader <roozbeh@google.com>2015-05-16 20:50:06 -0700
committerRoozbeh Pournader <roozbeh@google.com>2015-05-19 16:28:18 +0000
commit2d8a02e68b13a9590c1c9d5b8bfea7732e282ec6 (patch)
tree13bf8df0af9b6b7202d941020ee6751927c448c1 /data
parente1fcced61ae81a07ca8c93d8a14dd4eb5b6e36ff (diff)
downloadframeworks_base-2d8a02e68b13a9590c1c9d5b8bfea7732e282ec6.zip
frameworks_base-2d8a02e68b13a9590c1c9d5b8bfea7732e282ec6.tar.gz
frameworks_base-2d8a02e68b13a9590c1c9d5b8bfea7732e282ec6.tar.bz2
Update Naskh font names to match upstream and add Tibetan.
The latest files from the upstream Noto repository are named NotoNaskhArabic* instead of the previous NotoNaskh*. Also, Noto Sans Tibetan is now included in the fallback chain. Apart from supporting Tibetan and Dzongkha langauges, this adds a character (U+0FD6) that completes coverage for ARIB character sets. Bug: 13680438 Bug: 18181755 Bug: 18639453 Bug: 19390244 Change-Id: I09b493340d1453ef61b08c841e1731119d645822
Diffstat (limited to 'data')
-rw-r--r--data/fonts/fallback_fonts.xml13
-rw-r--r--data/fonts/fonts.xml11
2 files changed, 16 insertions, 8 deletions
diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index 0aa588b..5857de0 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -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>
@@ -387,6 +387,11 @@
</family>
<family>
<fileset>
+ <file>NotoSansTibetan-Regular.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
<file>NotoSansTifinagh-Regular.ttf</file>
</fileset>
</family>
diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml
index f903aab..62da0ff 100644
--- a/data/fonts/fonts.xml
+++ b/data/fonts/fonts.xml
@@ -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>
@@ -320,6 +320,9 @@
<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>
<family>