99975a3e25e11f5c5958d8a901d37902087c75fd - platform/frameworks/base

commit	99975a3e25e11f5c5958d8a901d37902087c75fd	[log] [tgz]
author	Roozbeh Pournader <roozbeh@google.com>	Wed Aug 09 09:42:20 2017 -0700
committer	Roozbeh Pournader <roozbeh@google.com>	Fri Aug 11 12:34:26 2017 -0700
tree	a78def3c7c7b984a6e3668879d08e3d25595ec3e
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

core/java/android/text/FontConfig.java[diff]
core/jni/android/graphics/FontFamily.cpp[diff]
core/tests/coretests/src/android/graphics/TypefaceSystemFallbackTest.java[diff]
data/fonts/fonts.xml[diff]
graphics/java/android/graphics/FontFamily.java[diff]
graphics/java/android/graphics/FontListParser.java[diff]
graphics/java/android/graphics/Typeface.java[diff]

7 files changed