summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorRoozbeh Pournader <roozbeh@google.com>2015-06-04 15:22:11 -0700
committerRoozbeh Pournader <roozbeh@google.com>2015-06-04 15:39:43 -0700
commit912dbdb9fa3558a5cff2c0c5d410a2abc978422b (patch)
treeceb4d9b416d0a11e577662d6030c489a44496070 /data
parent81f2992fac1667336cc526a380c696258569de09 (diff)
downloadframeworks_base-912dbdb9fa3558a5cff2c0c5d410a2abc978422b.zip
frameworks_base-912dbdb9fa3558a5cff2c0c5d410a2abc978422b.tar.gz
frameworks_base-912dbdb9fa3558a5cff2c0c5d410a2abc978422b.tar.bz2
Move NotoSansSymbols higher than CJK in the fallback chain.
This makes sure that symbol characters who have both an alternative or "full-width" version in the CJK fonts and a more regular version in the symbols font get the default or "half-width" version by default in non-CJK locales. This is not a complete fix: such "full-width" symbol characters only exist in the Simplfied Chinese font for now, which means in Traditional Chinese, Japanese, and Korean locales, they characters would now appear "half-width", which *may* be sub-optimal. The complete fix would make sure the ones that actually need to be "full-width" in TC/J/K are also included in the TC/J/K font. Bug: 21525318 Bug: 21525012 Bug: 21524421 Bug: 21521330 Bug: 21520316 Bug: 21518544 Bug: 21517912 Bug: 21503807 Bug: 21502245 Bug: 21501669 Bug: 21525905 Bug: 21524018 Bug: 21503952 Bug: 21502678 Change-Id: I93cf7119b45ed3c080cd39d631a687e0ef9fd8ce
Diffstat (limited to 'data')
-rw-r--r--data/fonts/fallback_fonts.xml10
-rw-r--r--data/fonts/fonts.xml6
2 files changed, 8 insertions, 8 deletions
diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index 5857de0..55c000c 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -407,6 +407,11 @@
</family>
<family>
<fileset>
+ <file>NotoSansSymbols-Regular-Subsetted.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
<file lang="zh-Hans">NotoSansSC-Regular.otf</file>
</fileset>
</family>
@@ -432,11 +437,6 @@
</family>
<family>
<fileset>
- <file>NotoSansSymbols-Regular-Subsetted.ttf</file>
- </fileset>
- </family>
- <family>
- <fileset>
<file>NotoColorEmoji.ttf</file>
</fileset>
</family>
diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml
index 62da0ff..dbe81fa 100644
--- a/data/fonts/fonts.xml
+++ b/data/fonts/fonts.xml
@@ -331,6 +331,9 @@
<family>
<font weight="400" style="normal">NotoSansYi-Regular.ttf</font>
</family>
+ <family>
+ <font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted.ttf</font>
+ </family>
<family lang="zh-Hans">
<font weight="400" style="normal">NotoSansSC-Regular.otf</font>
</family>
@@ -347,9 +350,6 @@
<font weight="400" style="normal">NanumGothic.ttf</font>
</family>
<family>
- <font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted.ttf</font>
- </family>
- <family>
<font weight="400" style="normal">NotoColorEmoji.ttf</font>
</family>
<family>