summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorRoozbeh Pournader <roozbeh@google.com>2015-04-06 12:23:57 -0700
committerRoozbeh Pournader <roozbeh@google.com>2015-04-06 19:28:18 +0000
commit9c5a14785b2e56eb22cf683f400a9c0bee08b17f (patch)
tree3cb81db43fae38bf7eead7c3aa095d6efb651511 /data
parent3544e6fa5629398cb0e541bd9aea0ec03073c0d2 (diff)
downloadframeworks_base-9c5a14785b2e56eb22cf683f400a9c0bee08b17f.zip
frameworks_base-9c5a14785b2e56eb22cf683f400a9c0bee08b17f.tar.gz
frameworks_base-9c5a14785b2e56eb22cf683f400a9c0bee08b17f.tar.bz2
Switch from Lohit Odia to Noto Sans Oriya fonts.
Noto Sans Oriya fonts also have bold and UI versions, which are added. Change-Id: Id622143688d89e25857c00489d81703780f79887
Diffstat (limited to 'data')
-rw-r--r--data/fonts/fallback_fonts.xml17
-rw-r--r--data/fonts/fonts.xml11
2 files changed, 20 insertions, 8 deletions
diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index 42b5d5d..5c3b90b 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -181,6 +181,18 @@
</family>
<family>
<fileset>
+ <file variant="elegant">NotoSansOriya-Regular.ttf</file>
+ <file variant="elegant">NotoSansOriya-Bold.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
+ <file variant="compact">NotoSansOriyaUI-Regular.ttf</file>
+ <file variant="compact">NotoSansOriyaUI-Bold.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
<file>NotoSansSinhala-Regular.ttf</file>
<file>NotoSansSinhala-Bold.ttf</file>
</fileset>
@@ -355,11 +367,6 @@
</family>
<family>
<fileset>
- <file>Lohit-Odia.ttf</file>
- </fileset>
- </family>
- <family>
- <fileset>
<file lang="zh-Hans">NotoSansHans-Regular.otf</file>
</fileset>
</family>
diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml
index 37527e9..f3a7647 100644
--- a/data/fonts/fonts.xml
+++ b/data/fonts/fonts.xml
@@ -191,6 +191,14 @@
<font weight="400" style="normal">NotoSansKannadaUI-Regular.ttf</font>
<font weight="700" style="normal">NotoSansKannadaUI-Bold.ttf</font>
</family>
+ <family variant="elegant">
+ <font weight="400" style="normal">NotoSansOriya-Regular.ttf</font>
+ <font weight="700" style="normal">NotoSansOriya-Bold.ttf</font>
+ </family>
+ <family variant="compact">
+ <font weight="400" style="normal">NotoSansOriyaUI-Regular.ttf</font>
+ <font weight="700" style="normal">NotoSansOriyaUI-Bold.ttf</font>
+ </family>
<family>
<font weight="400" style="normal">NotoSansSinhala-Regular.ttf</font>
<font weight="700" style="normal">NotoSansSinhala-Bold.ttf</font>
@@ -299,9 +307,6 @@
<family>
<font weight="400" style="normal">NotoSansYi-Regular.ttf</font>
</family>
- <family>
- <font weight="400" style="normal">Lohit-Odia.ttf</font>
- </family>
<family lang="zh-Hans">
<font weight="400" style="normal">NotoSansHans-Regular.otf</font>
</family>