aboutsummaryrefslogtreecommitdiffhomepage
path: root/resources
diff options
context:
space:
mode:
authorGravatar Ben Wagner <bungeman@google.com>2017-08-10 13:49:41 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-08-14 19:29:05 +0000
commitaee878d767a3965ee6409be9c72bb9ae6266bf52 (patch)
treec6f6e2cb26e624db3ab63cb9ecdfccaccd2869d1 /resources
parentdf33fefe14837d7a7130aacb6206dbe3ebc7d081 (diff)
Move lang to list in Android font manager.
Change-Id: Ia4af2769f4761e6b444ed0c232c48199872f3acc Reviewed-on: https://skia-review.googlesource.com/33480 Reviewed-by: Derek Sollenberger <djsollen@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/android_fonts/v22/fonts.xml14
1 files changed, 7 insertions, 7 deletions
diff --git a/resources/android_fonts/v22/fonts.xml b/resources/android_fonts/v22/fonts.xml
index f310ac4dfd..100c1a18b0 100644
--- a/resources/android_fonts/v22/fonts.xml
+++ b/resources/android_fonts/v22/fonts.xml
@@ -220,16 +220,16 @@
<font weight="400" style="normal">NotoSansYi-Regular.ttf</font>
</family>
<family lang="zh-Hans">
- <font weight="400" style="normal">NotoSansHans-Regular.otf</font>
+ <font weight="400" style="normal" index="2">NotoSansCJK-Regular.ttc</font>
</family>
- <family lang="zh-Hant">
- <font weight="400" style="normal">NotoSansHant-Regular.otf</font>
+ <family lang="zh-Hant zh-Bopo">
+ <font weight="400" style="normal" index="3">NotoSansCJK-Regular.ttc</font>
</family>
- <family lang="ja">
- <font weight="400" style="normal">NotoSansJP-Regular.otf</font>
+ <family lang=" ja ja-Latn">
+ <font weight="400" style="normal" index="0">NotoSansCJK-Regular.ttc</font>
</family>
- <family lang="ko">
- <font weight="400" style="normal">NotoSansKR-Regular.otf</font>
+ <family lang="ko ko-Latn ">
+ <font weight="400" style="normal" index="1">NotoSansCJK-Regular.ttc</font>
</family>
<family>
<font weight="400" style="normal">NanumGothic.ttf</font>