diff options
| author | Roozbeh Pournader <roozbeh@google.com> | 2017-08-09 09:42:20 -0700 |
|---|---|---|
| committer | Roozbeh Pournader <roozbeh@google.com> | 2017-08-11 12:34:26 -0700 |
| commit | 99975a3e25e11f5c5958d8a901d37902087c75fd (patch) | |
| tree | a78def3c7c7b984a6e3668879d08e3d25595ec3e /data/fonts | |
| parent | a7d731d5fecbac339a37ad963253b651b1ba7046 (diff) | |
Support multiple languages per font in fonts.xml
Minikin already supports multiple languages specified per font in
I7f13b51464c9b01982bb573251d77052b9ddbd70. This CL adds a couple of
such cases into fonts.xml and clarifies in the method and the
variable names and parameters that the frameworks is handling a
multi-language string when it is.
Fixes: 26687969
Test: make -j checkbuild
Test: bit FrameworksCoreTests:android.graphics.TypefaceSystemFallbackTest
Change-Id: Ifa540a95f87921983f9069330d1dd0892538a8df
Diffstat (limited to 'data/fonts')
| -rw-r--r-- | data/fonts/fonts.xml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml index ae93608726a3..209f364e041b 100644 --- a/data/fonts/fonts.xml +++ b/data/fonts/fonts.xml @@ -19,7 +19,7 @@ effectively add 300 to the weight, this ensures that 900 is the bold paired with the 500 weight, ensuring adequate contrast. --> -<familyset version="22"> +<familyset version="23"> <!-- first font is default --> <family name="sans-serif"> <font weight="100" style="normal">Roboto-Thin.ttf</font> @@ -128,8 +128,7 @@ <font weight="400" style="normal">NotoSansArmenian-Regular.ttf</font> <font weight="700" style="normal">NotoSansArmenian-Bold.ttf</font> </family> - <!-- TODO: add Geok --> - <family lang="und-Geor"> + <family lang="und-Geor und-Geok"> <font weight="400" style="normal">NotoSansGeorgian-Regular.ttf</font> <font weight="700" style="normal">NotoSansGeorgian-Bold.ttf</font> </family> @@ -474,8 +473,7 @@ <family lang="zh-Hans"> <font weight="400" style="normal" index="2">NotoSansCJK-Regular.ttc</font> </family> - <!-- TODO: Add Bopo --> - <family lang="zh-Hant"> + <family lang="zh-Hant zh-Bopo"> <font weight="400" style="normal" index="3">NotoSansCJK-Regular.ttc</font> </family> <family lang="ja"> |