summaryrefslogtreecommitdiffstats
path: root/data/fonts/Android.mk
diff options
context:
space:
mode:
authorBilly Hewlett <billyh@google.com>2012-07-18 09:51:45 -0700
committerVictoria Lease <violets@google.com>2012-08-20 08:51:23 -0700
commitac1cbaf2e5575ac75a0160e13089d51a0bb232fa (patch)
tree55f2d81ea5059a57b6de18b13deadcff5b24bc35 /data/fonts/Android.mk
parentbf5740e75efd87ae0213486e78e029403804c6f0 (diff)
downloadframeworks_base-ac1cbaf2e5575ac75a0160e13089d51a0bb232fa.zip
frameworks_base-ac1cbaf2e5575ac75a0160e13089d51a0bb232fa.tar.gz
frameworks_base-ac1cbaf2e5575ac75a0160e13089d51a0bb232fa.tar.bz2
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
Diffstat (limited to 'data/fonts/Android.mk')
-rw-r--r--data/fonts/Android.mk11
1 files changed, 1 insertions, 10 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk
index 3d6c9d3..7bc172c 100644
--- a/data/fonts/Android.mk
+++ b/data/fonts/Android.mk
@@ -76,14 +76,6 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
include $(BUILD_PREBUILT)
-include $(CLEAR_VARS)
-LOCAL_MODULE := fallback_fonts-ja.xml
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
-include $(BUILD_PREBUILT)
-
droidsans_fallback_src := DroidSansFallbackFull.ttf
extra_font_files := \
DroidSans.ttf \
@@ -91,8 +83,7 @@ extra_font_files := \
DroidSansEthiopic-Regular.ttf \
DroidSansTamil-Regular.ttf \
DroidSansTamil-Bold.ttf \
- MTLmr3m.ttf \
- fallback_fonts-ja.xml
+ MTLmr3m.ttf
endif # SMALLER_FONT_FOOTPRINT
################################