summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaph Levien <raph@google.com>2013-03-29 17:01:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-03-29 17:01:31 +0000
commit76a407442e0567e6c658cab546c32efc92711dc0 (patch)
tree5dcb7bed6b16c6f8146002ab50ad3b20ea1f9df1
parent8fed6bc894a993a195ebcb8e8772b725cd828f0d (diff)
parent6ff0bb6f5cc2678ee8f23e1c71faf1409af5df98 (diff)
downloadframeworks_base-76a407442e0567e6c658cab546c32efc92711dc0.zip
frameworks_base-76a407442e0567e6c658cab546c32efc92711dc0.tar.gz
frameworks_base-76a407442e0567e6c658cab546c32efc92711dc0.tar.bz2
Merge "Switch indic fonts to Noto" into jb-mr2-dev
-rw-r--r--data/fonts/fallback_fonts.xml40
1 files changed, 34 insertions, 6 deletions
diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index 999ddc4..744b15d 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -78,32 +78,60 @@
</family>
<family>
<fileset>
- <file>AnjaliNewLipi-light.ttf</file>
+ <file variant="elegant">NotoSansMalayalam-Regular.ttf</file>
+ <file variant="elegant">NotoSansMalayalam-Bold.ttf</file>
</fileset>
</family>
<family>
<fileset>
- <file>Lohit-Bengali.ttf</file>
+ <file variant="compact">NotoSansMalayalamUI-Regular.ttf</file>
+ <file variant="compact">NotoSansMalayalamUI-Bold.ttf</file>
</fileset>
</family>
<family>
<fileset>
- <file>Lohit-Kannada.ttf</file>
+ <file variant="elegant">NotoSansBengali-Regular.ttf</file>
+ <file variant="elegant">NotoSansBengali-Bold.ttf</file>
</fileset>
</family>
<family>
<fileset>
- <file>NanumGothic.ttf</file>
+ <file variant="compact">NotoSansBengaliUI-Regular.ttf</file>
+ <file variant="compact">NotoSansBengaliUI-Bold.ttf</file>
</fileset>
</family>
<family>
<fileset>
- <file>AndroidEmoji.ttf</file>
+ <file variant="elegant">NotoSansTelugu-Regular.ttf</file>
+ <file variant="elegant">NotoSansTelugu-Bold.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
+ <file variant="compact">NotoSansTeluguUI-Regular.ttf</file>
+ <file variant="compact">NotoSansTeluguUI-Bold.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
+ <file variant="elegant">NotoSansKannada-Regular.ttf</file>
+ <file variant="elegant">NotoSansKannada-Bold.ttf</file>
</fileset>
</family>
<family>
<fileset>
- <file>Lohit-Telugu.ttf</file>
+ <file variant="compact">NotoSansKannadaUI-Regular.ttf</file>
+ <file variant="compact">NotoSansKannadaUI-Bold.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
+ <file>NanumGothic.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
+ <file>AndroidEmoji.ttf</file>
</fileset>
</family>
<family>