summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoozbeh Pournader <roozbeh@google.com>2014-11-25 22:27:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-25 22:27:40 +0000
commitc08b47a7acf0192bb24d7d189345840f1c5258cc (patch)
tree74f7f7e031e2d096685c758c7243af17ada87241
parent3ed95fe2589c01e9255f4d75636fb8b0c83a01d5 (diff)
parent411b30cb56a91d0f817b9068054a7c43275a8996 (diff)
downloadframeworks_base-c08b47a7acf0192bb24d7d189345840f1c5258cc.zip
frameworks_base-c08b47a7acf0192bb24d7d189345840f1c5258cc.tar.gz
frameworks_base-c08b47a7acf0192bb24d7d189345840f1c5258cc.tar.bz2
Merge "Add Lohit Odia (Oriya) font to the fallback chain." into lmp-mr1-dev
-rw-r--r--data/fonts/fallback_fonts.xml5
-rw-r--r--data/fonts/fonts.xml3
2 files changed, 8 insertions, 0 deletions
diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index 4b38ad3..0244891 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -319,6 +319,11 @@
</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 4493554..a62e972 100644
--- a/data/fonts/fonts.xml
+++ b/data/fonts/fonts.xml
@@ -277,6 +277,9 @@
<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>