summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorVictoria Lease <violets@google.com>2012-07-18 08:48:33 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-18 08:48:34 -0700
commitaccf721ebdf4d3da53e8ae09572650775bfe10f8 (patch)
tree0227d051f84a6918eb4be36f82c38914e69e3437 /data
parent57bdd3d3782ceeba38dd862b7de73d47793bee93 (diff)
parent2a41a2d4ccd2f2037a8f44232486b0e08ed3cd4c (diff)
downloadframeworks_base-accf721ebdf4d3da53e8ae09572650775bfe10f8.zip
frameworks_base-accf721ebdf4d3da53e8ae09572650775bfe10f8.tar.gz
frameworks_base-accf721ebdf4d3da53e8ae09572650775bfe10f8.tar.bz2
Merge "Demoted Lohit-Telugu.ttf in fallback lists."
Diffstat (limited to 'data')
-rw-r--r--data/fonts/fallback_fonts-ja.xml12
-rw-r--r--data/fonts/fallback_fonts.xml12
2 files changed, 16 insertions, 8 deletions
diff --git a/data/fonts/fallback_fonts-ja.xml b/data/fonts/fallback_fonts-ja.xml
index 9d3eb8c..82e3a38 100644
--- a/data/fonts/fallback_fonts-ja.xml
+++ b/data/fonts/fallback_fonts-ja.xml
@@ -96,22 +96,26 @@
</family>
<family>
<fileset>
- <file>Lohit-Telugu.ttf</file>
+ <file>AndroidEmoji.ttf</file>
</fileset>
</family>
<family>
<fileset>
- <file>AndroidEmoji.ttf</file>
+ <file>MTLmr3m.ttf</file>
</fileset>
</family>
<family>
<fileset>
- <file>MTLmr3m.ttf</file>
+ <file>DroidSansFallback.ttf</file>
</fileset>
</family>
+ <!--
+ Fonts below this point have problematic glyphs and should not be moved
+ higher in the fallback list until those glyphs have been fixed.
+ -->
<family>
<fileset>
- <file>DroidSansFallback.ttf</file>
+ <file>Lohit-Telugu.ttf</file> <!-- masks U+FFBC-10007 -->
</fileset>
</family>
</familyset>
diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index 8ae9f93..758adb5 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -96,22 +96,26 @@
</family>
<family>
<fileset>
- <file>Lohit-Telugu.ttf</file>
+ <file>AndroidEmoji.ttf</file>
</fileset>
</family>
<family>
<fileset>
- <file>AndroidEmoji.ttf</file>
+ <file>DroidSansFallback.ttf</file>
</fileset>
</family>
<family>
<fileset>
- <file>DroidSansFallback.ttf</file>
+ <file>MTLmr3m.ttf</file>
</fileset>
</family>
+ <!--
+ Fonts below this point have problematic glyphs and should not be moved
+ higher in the fallback list until those glyphs have been fixed.
+ -->
<family>
<fileset>
- <file>MTLmr3m.ttf</file>
+ <file>Lohit-Telugu.ttf</file> <!-- masks U+FFBC-10007 -->
</fileset>
</family>
</familyset>