summaryrefslogtreecommitdiffstats
path: root/graphics/java
diff options
context:
space:
mode:
authord34d <clark@cyngn.com>2016-02-03 13:07:09 -0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-02-05 15:55:41 -0800
commitf1d7b86dd267ed5b59e51339edc4553d37561a39 (patch)
tree11a9d1ebb7b2c4e9c01a146a03e0246801bf1a80 /graphics/java
parent326918c0b98309dab6a3598471d653a400f435f2 (diff)
downloadframeworks_base-f1d7b86dd267ed5b59e51339edc4553d37561a39.zip
frameworks_base-f1d7b86dd267ed5b59e51339edc4553d37561a39.tar.gz
frameworks_base-f1d7b86dd267ed5b59e51339edc4553d37561a39.tar.bz2
Fonts: add sans-serif fallback fonts first
This fixes an issue where the non line breaking hyphen U+2011 being displayed as and underscore due to the glyph being found in one of the fallback fonts. Adding the sans-serif(Roboto) fonts as fallbacks first allows the glyph to be found in this family before moving on to the other fallback fonts. Change-Id: Ie6ac7e8c838f3a2b864ff25bc9569a8f37beffb9 TICKET: CYNGNOS-1855
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/graphics/Typeface.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java
index 4e9788a..6aba87b 100644
--- a/graphics/java/android/graphics/Typeface.java
+++ b/graphics/java/android/graphics/Typeface.java
@@ -379,9 +379,9 @@ public class Typeface {
if (configFile == themeConfigFile) {
systemFontConfig = FontListParser.parse(systemConfigFile,
getSystemFontDirLocation().getAbsolutePath());
+ addFallbackFontsForFamilyName(systemFontConfig, fontConfig, SANS_SERIF_FAMILY_NAME);
addMissingFontFamilies(systemFontConfig, fontConfig);
addMissingFontAliases(systemFontConfig, fontConfig);
- addFallbackFontsForFamilyName(systemFontConfig, fontConfig, SANS_SERIF_FAMILY_NAME);
}
List<FontFamily> familyList = new ArrayList<FontFamily>();