summaryrefslogtreecommitdiffstats
path: root/data/fonts
diff options
context:
space:
mode:
authorBilly Hewlett <billyh@google.com>2012-06-21 09:57:57 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-21 09:57:57 -0700
commit973835b264fcbebf8a5077d5a2989bccd54de22c (patch)
tree3c66597814c67f42af11a04f44b048e9b9a8635c /data/fonts
parentf49a19e96b721c89d4fe2f579f201b5c5ae86531 (diff)
downloadframeworks_base-973835b264fcbebf8a5077d5a2989bccd54de22c.zip
frameworks_base-973835b264fcbebf8a5077d5a2989bccd54de22c.tar.gz
frameworks_base-973835b264fcbebf8a5077d5a2989bccd54de22c.tar.bz2
Revert "Revert "Elegant fonts for Webkit, Compact fonts for Textview (Data)""
This reverts commit f49a19e96b721c89d4fe2f579f201b5c5ae86531
Diffstat (limited to 'data/fonts')
-rw-r--r--data/fonts/fallback_fonts-ja.xml7
-rw-r--r--data/fonts/fallback_fonts.xml7
2 files changed, 12 insertions, 2 deletions
diff --git a/data/fonts/fallback_fonts-ja.xml b/data/fonts/fallback_fonts-ja.xml
index 5f9b5ed..9d3eb8c 100644
--- a/data/fonts/fallback_fonts-ja.xml
+++ b/data/fonts/fallback_fonts-ja.xml
@@ -34,7 +34,12 @@
<familyset>
<family>
<fileset>
- <file>DroidNaskh-Regular-SystemUI.ttf</file>
+ <file variant="elegant">DroidNaskh-Regular.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
+ <file variant="compact">DroidNaskh-Regular-SystemUI.ttf</file>
</fileset>
</family>
<family>
diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index 5f7017e..8ae9f93 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -34,7 +34,12 @@
<familyset>
<family>
<fileset>
- <file>DroidNaskh-Regular-SystemUI.ttf</file>
+ <file variant="elegant">DroidNaskh-Regular.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
+ <file variant="compact">DroidNaskh-Regular-SystemUI.ttf</file>
</fileset>
</family>
<family>