summaryrefslogtreecommitdiffstats
path: root/data/fonts
diff options
context:
space:
mode:
authorVictoria Lease <violets@google.com>2012-05-11 16:52:00 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-11 16:52:00 -0700
commitf1b0c4e5c810afb203e286eea0491a1f5670e5c3 (patch)
tree4a7303397adb875d600e2555c07a7697fd907749 /data/fonts
parent909c4b855a372dbc70ce6777df64d12ae93ad2d5 (diff)
parentc24de468ff6b293191823ba0b702968d8de052ae (diff)
downloadframeworks_base-f1b0c4e5c810afb203e286eea0491a1f5670e5c3.zip
frameworks_base-f1b0c4e5c810afb203e286eea0491a1f5670e5c3.tar.gz
frameworks_base-f1b0c4e5c810afb203e286eea0491a1f5670e5c3.tar.bz2
Merge "Add fallback fonts for Malayalam, Kannada, and Telugu scripts" into jb-dev
Diffstat (limited to 'data/fonts')
-rw-r--r--data/fonts/fallback_fonts-ja.xml19
-rw-r--r--data/fonts/fallback_fonts.xml18
2 files changed, 33 insertions, 4 deletions
diff --git a/data/fonts/fallback_fonts-ja.xml b/data/fonts/fallback_fonts-ja.xml
index be53d1d..5f9b5ed 100644
--- a/data/fonts/fallback_fonts-ja.xml
+++ b/data/fonts/fallback_fonts-ja.xml
@@ -70,13 +70,28 @@
</family>
<family>
<fileset>
+ <file>DroidSansTamil-Regular.ttf</file>
+ <file>DroidSansTamil-Bold.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
+ <file>AnjaliNewLipi-light.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
<file>Lohit-Bengali.ttf</file>
</fileset>
</family>
<family>
<fileset>
- <file>DroidSansTamil-Regular.ttf</file>
- <file>DroidSansTamil-Bold.ttf</file>
+ <file>Lohit-Kannada.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
+ <file>Lohit-Telugu.ttf</file>
</fileset>
</family>
<family>
diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index 80fffa9..8517152 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -70,13 +70,27 @@
</family>
<family>
<fileset>
+ <file>DroidSansTamil-Regular.ttf</file>
+ <file>DroidSansTamil-Bold.ttf</file>
+ </family>
+ <family>
+ <fileset>
+ <file>AnjaliNewLipi-light.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
<file>Lohit-Bengali.ttf</file>
</fileset>
</family>
<family>
<fileset>
- <file>DroidSansTamil-Regular.ttf</file>
- <file>DroidSansTamil-Bold.ttf</file>
+ <file>Lohit-Kannada.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
+ <file>Lohit-Telugu.ttf</file>
</fileset>
</family>
<family>