summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorBilly Hewlett <billyh@google.com>2012-06-19 17:02:06 -0700
committerBilly Hewlett <billyh@google.com>2012-06-20 09:24:26 -0700
commitbe97f1458bc90619ad68859dfdd0cb5f74daaa4d (patch)
tree3c66597814c67f42af11a04f44b048e9b9a8635c /data
parent47ab650bca91200b0b373521691f33b5ce493d6e (diff)
downloadframeworks_base-be97f1458bc90619ad68859dfdd0cb5f74daaa4d.zip
frameworks_base-be97f1458bc90619ad68859dfdd0cb5f74daaa4d.tar.gz
frameworks_base-be97f1458bc90619ad68859dfdd0cb5f74daaa4d.tar.bz2
Elegant fonts for Webkit, Compact fonts for Textview (Data)
Font files are marked with elegant or compact in attributes. This is the data check for the code checkin with a similar title Bug: 6649136 Change-Id: Ie246ae0cff55c1e76c0f32012a740547274e8221
Diffstat (limited to 'data')
-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>