Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c097a9c authored by Russell Brenner's avatar Russell Brenner
Browse files

Add Japanese to fallback fonts 

On devices with adequate space, add MTLmr3m.ttf (Japanese) to the set
of fallback fonts. By default, DroidSansFallback (Chinese) is given
priority over MTLmr3m. If the locale is changed to Japanese, the
priority is reversed.

Bug: 6272763
Change-Id: I785a927d6dff0206aa9a670c51fdad76e219fc97
parent ecc395a5

data/fonts/Android.mk

+25 −4
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \ 
# On space-constrained devices, we include a subset of fonts:

ifeq ($(SMALLER_FONT_FOOTPRINT),true)

droidsans_fallback_src := DroidSansFallback.ttf

extra_droidsans_fonts := DroidSans.ttf DroidSans-Bold.ttf

extra_font_files := DroidSans.ttf DroidSans-Bold.ttf

else

include $(CLEAR_VARS)

LOCAL_MODULE := DroidSansEthiopic-Regular.ttf
@@ -64,8 +64,29 @@ LOCAL_MODULE_TAGS := optional 
LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts

include $(BUILD_PREBUILT)



include $(CLEAR_VARS)

LOCAL_MODULE := MTLmr3m.ttf

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_MODULE_CLASS := ETC

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_droidsans_fonts := DroidSans.ttf DroidSans-Bold.ttf DroidSansEthiopic-Regular.ttf

extra_font_files := \

	DroidSans.ttf \

	DroidSans-Bold.ttf \

	DroidSansEthiopic-Regular.ttf \

	MTLmr3m.ttf \

	fallback_fonts-ja.xml

endif  # SMALLER_FONT_FOOTPRINT



################################
@@ -75,13 +96,13 @@ LOCAL_SRC_FILES := $(droidsans_fallback_src) 
LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts

LOCAL_REQUIRED_MODULES := $(extra_droidsans_fonts)

LOCAL_REQUIRED_MODULES := $(extra_font_files)

include $(BUILD_PREBUILT)



font_symlink_src :=

font_symlink :=

droidsans_fallback_src :=

extra_droidsans_fonts :=

extra_font_files :=



################################

# Build the rest font files as prebuilt.

data/fonts/fallback_fonts-ja.xml

0 → 100644
+96 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Fallback Fonts



    This file specifies the fonts, and the priority order, that will be searched for any

    glyphs not handled by the default fonts specified in /system/etc/system_fonts.xml.

    Each entry consists of a family tag and a list of files (file names) which support that

    family. The fonts for each family are listed in the order of the styles that they

    handle (the order is: regular, bold, italic, and bold-italic). The order in which the

    families are listed in this file represents the order in which these fallback fonts

    will be searched for glyphs that are not supported by the default system fonts (which are

    found in /system/etc/system_fonts.xml).



    Note that there is not nameset for fallback fonts, unlike the fonts specified in

    system_fonts.xml. The ability to support specific names in fallback fonts may be supported

    in the future. For now, the lack of files entries here is an indicator to the system that

    these are fallback fonts, instead of default named system fonts.



    There is another optional file in /vendor/etc/fallback_fonts.xml. That file can be used to

    provide references to other font families that should be used in addition to the default

    fallback fonts. That file can also specify the order in which the fallback fonts should be

    searched, to ensure that a vendor-provided font will be used before another fallback font

    which happens to handle the same glyph.



    Han languages (Chinese, Japanese, and Korean) share a common range of unicode characters;

    their ordering in the fallback or vendor files gives priority to the first in the list.

    Locale-specific ordering can be configured by adding language and region codes to the end

    of the filename (e.g. /system/etc/fallback_fonts-ja.xml). When no region code is used,

    as with this example, all regions are matched. Use separate files for each supported locale.

    The standard fallback file (fallback_fonts.xml) is used when a locale does not have its own

    file. All fallback files must contain the same complete set of fonts; only their ordering

    can differ.

-->

<familyset>

    <family>

        <fileset>

            <file>DroidSansArabic.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>DroidSansEthiopic-Regular.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>DroidSansHebrew-Regular.ttf</file>

            <file>DroidSansHebrew-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>DroidSansThai.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>DroidSansArmenian.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>DroidSansGeorgian.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>Lohit-Devanagari.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>Lohit-Bengali.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>Lohit-Tamil.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>AndroidEmoji.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>MTLmr3m.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>DroidSansFallback.ttf</file>

        </fileset>

    </family>

</familyset>

data/fonts/fallback_fonts.xml

+5 −0
Original line number Diff line number Diff line
@@ -88,4 +88,9 @@ 
            <file>DroidSansFallback.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>MTLmr3m.ttf</file>

        </fileset>

    </family>

</familyset>

data/fonts/fonts.mk

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
# Warning: this is actually a product definition, to be inherited from



PRODUCT_COPY_FILES := \

    frameworks/base/data/fonts/system_fonts.xml:system/etc/system_fonts.xml \

    frameworks/base/data/fonts/fallback_fonts.xml:system/etc/fallback_fonts.xml

    frameworks/base/data/fonts/system_fonts.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/system_fonts.xml \

    frameworks/base/data/fonts/fallback_fonts.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/fallback_fonts.xml



PRODUCT_PACKAGES := \

    DroidSansFallback.ttf \