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

Commit f9273e18 authored by Roozbeh Pournader's avatar Roozbeh Pournader
Browse files

Remove legacy font configuration files. 

They were no longer in use by frameworks. They were never part of a
public API and were kept in the system just in case a legacy app read
them. They had also been deprecated for three releases, which should
have given everybody enough time to switch.

Bug: 21785593
Change-Id: Ib80bcea92e45b608388455ef576bbfde647f77db
parent d966da5e

data/fonts/fallback_fonts.xml

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

<!--

    NOTE: this file is the legacy format, for compatibility with apps. The new,

    more flexible format is fonts.xml. Please keep the two in sync until the legacy

    format can be fully removed.



    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.

    Language-specific ordering can be configured by adding a BCP 47-style "lang" attribute to

    a "file" element; fonts matching the language of text being drawn will be prioritised over

    all others.

-->

<familyset>

    <family>

        <fileset>

            <file variant="elegant">NotoNaskhArabic-Regular.ttf</file>

            <file variant="elegant">NotoNaskhArabic-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="compact">NotoNaskhArabicUI-Regular.ttf</file>

            <file variant="compact">NotoNaskhArabicUI-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

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

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

        </fileset>

    </family>

    <family>

        <fileset>

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

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

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="elegant">NotoSansThai-Regular.ttf</file>

            <file variant="elegant">NotoSansThai-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="compact">NotoSansThaiUI-Regular.ttf</file>

            <file variant="compact">NotoSansThaiUI-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

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

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

        </fileset>

    </family>

    <family>

        <fileset>

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

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

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="elegant">NotoSansDevanagari-Regular.ttf</file>

            <file variant="elegant">NotoSansDevanagari-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="compact">NotoSansDevanagariUI-Regular.ttf</file>

            <file variant="compact">NotoSansDevanagariUI-Bold.ttf</file>

        </fileset>

    </family>

    <!-- Gujarati should come after Devanagari -->

    <family>

        <fileset>

            <file variant="elegant">NotoSansGujarati-Regular.ttf</file>

            <file variant="elegant">NotoSansGujarati-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="compact">NotoSansGujaratiUI-Regular.ttf</file>

            <file variant="compact">NotoSansGujaratiUI-Bold.ttf</file>

        </fileset>

    </family>

    <!-- Gurmukhi should come after Devanagari -->

    <family>

        <fileset>

            <file variant="elegant">NotoSansGurmukhi-Regular.ttf</file>

            <file variant="elegant">NotoSansGurmukhi-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="compact">NotoSansGurmukhiUI-Regular.ttf</file>

            <file variant="compact">NotoSansGurmukhiUI-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="elegant">NotoSansTamil-Regular.ttf</file>

            <file variant="elegant">NotoSansTamil-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="compact">NotoSansTamilUI-Regular.ttf</file>

            <file variant="compact">NotoSansTamilUI-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="elegant">NotoSansMalayalam-Regular.ttf</file>

            <file variant="elegant">NotoSansMalayalam-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="compact">NotoSansMalayalamUI-Regular.ttf</file>

            <file variant="compact">NotoSansMalayalamUI-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="elegant">NotoSansBengali-Regular.ttf</file>

            <file variant="elegant">NotoSansBengali-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="compact">NotoSansBengaliUI-Regular.ttf</file>

            <file variant="compact">NotoSansBengaliUI-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="elegant">NotoSansTelugu-Regular.ttf</file>

            <file variant="elegant">NotoSansTelugu-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="compact">NotoSansTeluguUI-Regular.ttf</file>

            <file variant="compact">NotoSansTeluguUI-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="elegant">NotoSansKannada-Regular.ttf</file>

            <file variant="elegant">NotoSansKannada-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="compact">NotoSansKannadaUI-Regular.ttf</file>

            <file variant="compact">NotoSansKannadaUI-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="elegant">NotoSansOriya-Regular.ttf</file>

            <file variant="elegant">NotoSansOriya-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="compact">NotoSansOriyaUI-Regular.ttf</file>

            <file variant="compact">NotoSansOriyaUI-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

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

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

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="elegant">NotoSansKhmer-Regular.ttf</file>

            <file variant="elegant">NotoSansKhmer-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="compact">NotoSansKhmerUI-Regular.ttf</file>

            <file variant="compact">NotoSansKhmerUI-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="elegant">NotoSansLao-Regular.ttf</file>

            <file variant="elegant">NotoSansLao-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="compact">NotoSansLaoUI-Regular.ttf</file>

            <file variant="compact">NotoSansLaoUI-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="elegant">NotoSansMyanmar-Regular.ttf</file>

            <file variant="elegant">NotoSansMyanmar-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="compact">NotoSansMyanmarUI-Regular.ttf</file>

            <file variant="compact">NotoSansMyanmarUI-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

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

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

        </fileset>

    </family>

    <family>

        <fileset>

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

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

            <file>NotoSansSymbols-Regular-Subsetted.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file lang="zh-Hans">NotoSansSC-Regular.otf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file lang="zh-Hant">NotoSansTC-Regular.otf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file lang="ja">NotoSansJP-Regular.otf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file lang="ko">NotoSansKR-Regular.otf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>NanumGothic.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>NotoColorEmoji.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>DroidSansFallback.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file lang="ja">MTLmr3m.ttf</file>

        </fileset>

    </family>

    <!--

        Tai Le and Mongolian are intentionally kept last, to make sure they don't override

        the East Asian punctuation for Chinese.

    -->

    <family>

        <fileset>

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

        </fileset>

    </family>

    <family>

        <fileset>

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

        </fileset>

    </family>

</familyset>

data/fonts/fonts.mk

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



PRODUCT_COPY_FILES := \

    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 \

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



PRODUCT_PACKAGES := \

data/fonts/fonts.xml

+1 −6
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    NOTE: this is the newer (L) version of the system font configuration,

    supporting richer weight selection. Some apps will expect the older

    version, so please keep system_fonts.xml and fallback_fonts.xml in sync

    with any changes, even though framework will only read this file.



    All fonts withohut names are added to the default list. Fonts are chosen

    All fonts without names are added to the default list. Fonts are chosen

    based on a match: full BCP-47 language tag including script, then just

    language, and finally order (the first font containing the glyph).

data/fonts/system_fonts.xml

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

<!--

    System Fonts



    This file lists the font families that will be used by default for all supported glyphs.

    Each entry consists of a family, various names that are supported by that family, and

    up to four font files. The font files are listed in the order of the styles which they

    support: regular, bold, italic and bold-italic. If less than four styles are listed, then

    the styles with no associated font file will be supported by the other font files listed.



    The first family is also the default font, which handles font request that have not specified

    specific font names.



    Any glyph that is not handled by the system fonts will cause a search of the fallback fonts.

    The default fallback fonts are specified in the file /system/etc/fallback_fonts.xml, and there

    is an optional file which may be supplied by vendors to specify other fallback fonts to use

    in /vendor/etc/fallback_fonts.xml.

-->

<familyset>



    <family>

        <nameset>

            <name>sans-serif</name>

            <name>arial</name>

            <name>helvetica</name>

            <name>tahoma</name>

            <name>verdana</name>

        </nameset>

        <fileset>

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

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

            <file>Roboto-Italic.ttf</file>

            <file>Roboto-BoldItalic.ttf</file>

        </fileset>

    </family>



    <family>

        <nameset>

            <name>sans-serif-light</name>

        </nameset>

        <fileset>

            <file>Roboto-Light.ttf</file>

            <file>Roboto-LightItalic.ttf</file>

        </fileset>

    </family>



    <family>

        <nameset>

            <name>sans-serif-thin</name>

        </nameset>

        <fileset>

            <file>Roboto-Thin.ttf</file>

            <file>Roboto-ThinItalic.ttf</file>

        </fileset>

    </family>



    <family>

        <nameset>

            <name>sans-serif-condensed</name>

        </nameset>

        <fileset>

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

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

            <file>RobotoCondensed-Italic.ttf</file>

            <file>RobotoCondensed-BoldItalic.ttf</file>

        </fileset>

    </family>



    <family>

        <nameset>

            <name>sans-serif-medium</name>

        </nameset>

        <fileset>

            <file>Roboto-Medium.ttf</file>

            <file>Roboto-MediumItalic.ttf</file>

        </fileset>

    </family>



    <family>

        <nameset>

            <name>sans-serif-black</name>

        </nameset>

        <fileset>

            <file>Roboto-Black.ttf</file>

            <file>Roboto-BlackItalic.ttf</file>

        </fileset>

    </family>



    <family>

        <nameset>

            <name>sans-serif-condensed-light</name>

        </nameset>

        <fileset>

            <file>RobotoCondensed-Light.ttf</file>

            <file>RobotoCondensed-LightItalic.ttf</file>

        </fileset>

    </family>



    <family>

        <nameset>

            <name>serif</name>

            <name>times</name>

            <name>times new roman</name>

            <name>palatino</name>

            <name>georgia</name>

            <name>baskerville</name>

            <name>goudy</name>

            <name>fantasy</name>

            <name>ITC Stone Serif</name>

        </nameset>

        <fileset>

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

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

            <file>NotoSerif-Italic.ttf</file>

            <file>NotoSerif-BoldItalic.ttf</file>

        </fileset>

    </family>



    <family>

        <nameset>

            <name>Droid Sans</name>

        </nameset>

        <fileset>

            <file>DroidSans.ttf</file>

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

        </fileset>

    </family>



    <family>

        <nameset>

            <name>monospace</name>

            <name>sans-serif-monospace</name>

            <name>monaco</name>

        </nameset>

        <fileset>

            <file>DroidSansMono.ttf</file>

        </fileset>

    </family>



    <family>

        <nameset>

            <name>serif-monospace</name>

            <name>courier</name>

            <name>courier new</name>

        </nameset>

        <fileset>

            <file>CutiveMono.ttf</file>

        </fileset>

    </family>



    <family>

        <nameset>

            <name>casual</name>

        </nameset>

        <fileset>

            <file>ComingSoon.ttf</file>

        </fileset>

    </family>



    <family>

        <nameset>

            <name>cursive</name>

        </nameset>

        <fileset>

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

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

        </fileset>

    </family>



    <family>

        <nameset>

            <name>sans-serif-smallcaps</name>

        </nameset>

        <fileset>

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

        </fileset>

    </family>



</familyset>

data/fonts/vendor_fonts.xml

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

<!--

    Vendor-provided fallback fonts



    This file can be edited to add references to fonts that are not installed or referenced in the

    default system. The file should then be placed in /vendor/etc/fallback_fonts.xml. Note

    that in your makefile, this directory should be referenced as $(TARGET_COPY_OUT_VENDOR)/etc/:



        PRODUCT_COPY_FILES += \

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



    For example, vendors might want to build configurations for locales that are

    better served by fonts which either handle glyphs not supported in the default fonts or which

    handle these glyphs differently than the default fallback fonts.

    Each entry in this list is a "family", which consists of a list of "files"

    (the filenames for that family). The files objects are

    provided in the order of the styles supported for that family: regular, bold, italic, and

    bold-italic. Only providing one font means that all styles will be rendered with that font.

    Providing two means that these two fonts will render regular and bold fonts (italics will

    be mapped to these two fonts).



    There is also an optional "order" attribute on the Family tag. This specifies the index at

    which that family of fonts should be inserted in the fallback font list, where the

    default fallback fonts on the system (in /system/etc/fallback_fonts.xml) start at index 0.

    If no 'order' attribute is supplied, that family will be inserted either at the end of the

    current fallback list (if no order was supplied for any previous family in this file) or

    after the previous family (if there was an order specified previously). Typically, vendors

    may want to supply an order for the first family that puts this set of fonts at the appropriate

    place in the overall fallback fonts. The order of this list determines which fallback font

    will be used to support any glyphs that are not handled by the default system fonts.



    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.

    Language-specific ordering can be configured by adding a BCP 47-style "lang" attribute to

    a "file" element; fonts matching the language of text being drawn will be prioritised over

    all others.



    The sample configuration below is an example of how one might provide two families of fonts

    that get inserted at the first and second (0  and 1) position in the overall fallback fonts.



    See /system/etc/system_fonts.xml and /system/etc/fallback_fonts.xml for more information

    and to understand the order in which the default system fonts are loaded and structured for

    lookup.

-->



<!-- Sample fallback font additions to the default fallback list. These fonts will be added

    to the top two positions of the fallback list, since the first has an order of 0. -->

<!--

<familyset>

    <family order="0">

        <fileset>

            <file>MyFont.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>MyOtherFont.ttf</file>

        </fileset>

    </family>

</familyset>

--->