summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaph Levien <raph@google.com>2014-07-10 15:45:26 -0700
committerRaph Levien <raph@google.com>2014-07-10 22:57:51 +0000
commitb249225456bd0015ad775bfc3d6baa5827f0edee (patch)
tree6d38d4168a50a956ad1b4afb6ebf62c33eac2562
parent4c33b9f7d4e64f9352e81e7fa14eafcfd440d3bb (diff)
downloadframeworks_base-b249225456bd0015ad775bfc3d6baa5827f0edee.zip
frameworks_base-b249225456bd0015ad775bfc3d6baa5827f0edee.tar.gz
frameworks_base-b249225456bd0015ad775bfc3d6baa5827f0edee.tar.bz2
Fix BCP47 language tags in fallback_fonts.xml
The BCP47 tag we use for selecting Simplified vs Traditional Chinese is Hans and Hant. This patch uses those tags in fallback_fonts.xml rather than country names, which weren't getting matched. Change-Id: I97e1da7b86e8fe8f026365146393304a5ab74443
-rw-r--r--data/fonts/fallback_fonts.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index a7e159a..0f0281b 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -234,12 +234,12 @@
</family>
<family>
<fileset>
- <file lang="zh-CN">NotoSansHans-Regular.otf</file>
+ <file lang="zh-Hans">NotoSansHans-Regular.otf</file>
</fileset>
</family>
<family>
<fileset>
- <file lang="zh-TW">NotoSansHant-Regular.otf</file>
+ <file lang="zh-Hant">NotoSansHant-Regular.otf</file>
</fileset>
</family>
<family>