OSDN Git Service

DO NOT MERGE Han Preference
authorBilly Hewlett <billyh@google.com>
Wed, 18 Jul 2012 16:51:45 +0000 (09:51 -0700)
committerVictoria Lease <violets@google.com>
Mon, 20 Aug 2012 15:51:23 +0000 (08:51 -0700)
commitac1cbaf2e5575ac75a0160e13089d51a0bb232fa
tree55f2d81ea5059a57b6de18b13deadcff5b24bc35
parentbf5740e75efd87ae0213486e78e029403804c6f0
DO NOT MERGE Han Preference

Cherry-pick Ib5dd86950156c5a438f25c289acb839206bb455a from master.

Data: label MTLmr3m with "ja" locale attribute, fallback_fonts-ja.xml removed,
as we only need a single fallback font file
Code: Add locale and variant to TextLayoutCache.  Paint.java sets textLocale as
the language (for example, "ja") rather than the language/locale concatenated
(for example "ja_JP")

This checkin, along with Change-Id: Id8c91ae0be6cad8a7ef77a0cd5803676290986c1,
allows text view objects to set their locale dynamically and skia will use the
correct font for the locale.

Change-Id: Ieb60b0d7a39fcfef4f8ce90cd4f6065d33673710
core/jni/android/graphics/Paint.cpp
core/jni/android/graphics/TextLayoutCache.cpp
core/jni/android/graphics/TextLayoutCache.h
data/fonts/Android.mk
data/fonts/fallback_fonts-ja.xml [deleted file]
data/fonts/fallback_fonts.xml
data/fonts/vendor_fonts.xml