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

Commit ed00bfdf authored by Clara Bayarri's avatar Clara Bayarri
Browse files

Implement .xml font resource support 

This change implements the loading and parsing
of xml type font resources, and makes sure it is
used properly by TextView styles.

Test: run cts -m CtsContentTestCases -t android.content.res.cts.ResourcesTest
run cts -m CtsWidgetTestCases -t android.widget.cts.TextViewTest#testFontResources*

Change-Id: I5a2930b3ba7dad67d9607e9036a5dde6bab0c5a4
parent a1dc8f6d

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10813,6 +10813,7 @@ package android.content.res { 
    method public int getDimensionPixelSize(int, int);

    method public android.graphics.drawable.Drawable getDrawable(int);

    method public float getFloat(int, float);

    method public android.graphics.Typeface getFont(int);

    method public float getFraction(int, int, int, float);

    method public int getIndex(int);

    method public int getIndexCount();

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11371,6 +11371,7 @@ package android.content.res { 
    method public int getDimensionPixelSize(int, int);

    method public android.graphics.drawable.Drawable getDrawable(int);

    method public float getFloat(int, float);

    method public android.graphics.Typeface getFont(int);

    method public float getFraction(int, int, int, float);

    method public int getIndex(int);

    method public int getIndexCount();

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10845,6 +10845,7 @@ package android.content.res { 
    method public int getDimensionPixelSize(int, int);

    method public android.graphics.drawable.Drawable getDrawable(int);

    method public float getFloat(int, float);

    method public android.graphics.Typeface getFont(int);

    method public float getFraction(int, int, int, float);

    method public int getIndex(int);

    method public int getIndexCount();

core/java/android/annotation/FontRes.java

0 → 100644
+37 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package android.annotation;



import java.lang.annotation.Documented;

import java.lang.annotation.Retention;

import java.lang.annotation.Target;



import static java.lang.annotation.ElementType.FIELD;

import static java.lang.annotation.ElementType.METHOD;

import static java.lang.annotation.ElementType.PARAMETER;

import static java.lang.annotation.RetentionPolicy.SOURCE;



/**

 * Denotes that an integer parameter, field or method return value is expected

 * to be a Font resource reference (e.g. R.font.myfont).

 *

 * @hide

 */

@Documented

@Retention(SOURCE)

@Target({METHOD, PARAMETER, FIELD})

public @interface FontRes {

}

core/java/android/content/res/FontResourcesParser.java

0 → 100644
+104 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package android.content.res;



import com.android.internal.R;

import android.text.FontConfig;

import android.util.AttributeSet;

import android.util.Xml;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;



import java.io.IOException;

import java.util.ArrayList;

import java.util.List;



/**

 * Parser for xml type font resources.

 * @hide

 */

public class FontResourcesParser {

    private static final int NORMAL_WEIGHT = 400;

    private static final String ITALIC = "italic";



    public static FontConfig parse(XmlPullParser parser, Resources resources)

            throws XmlPullParserException, IOException {

        int type;

        while ((type=parser.next()) != XmlPullParser.START_TAG

                && type != XmlPullParser.END_DOCUMENT) {

            // Empty loop.

        }



        if (type != XmlPullParser.START_TAG) {

            throw new XmlPullParserException("No start tag found");

        }

        return readFamilies(parser, resources);

    }



    private static FontConfig readFamilies(XmlPullParser parser, Resources resources)

            throws XmlPullParserException, IOException {

        FontConfig config = new FontConfig();

        parser.require(XmlPullParser.START_TAG, null, "font-family");

        String tag = parser.getName();

        if (tag.equals("font-family")) {

            config.getFamilies().add(readFamily(parser, resources));

        } else {

            skip(parser);

        }

        return config;

    }



    private static FontConfig.Family readFamily(XmlPullParser parser, Resources resources)

            throws XmlPullParserException, IOException {

        List<FontConfig.Font> fonts = new ArrayList<>();

        while (parser.next() != XmlPullParser.END_TAG) {

            if (parser.getEventType() != XmlPullParser.START_TAG) continue;

            String tag = parser.getName();

            if (tag.equals("font")) {

                fonts.add(readFont(parser, resources));

            } else {

                skip(parser);

            }

        }

        return new FontConfig.Family(null, fonts, null, null);

    }



    private static FontConfig.Font readFont(XmlPullParser parser, Resources resources)

            throws XmlPullParserException, IOException {

        AttributeSet attrs = Xml.asAttributeSet(parser);

        TypedArray array = resources.obtainAttributes(attrs, R.styleable.FontFamilyFont);

        int weight = array.getInt(R.styleable.FontFamilyFont_fontWeight, NORMAL_WEIGHT);

        boolean isItalic = ITALIC.equals(array.getString(R.styleable.FontFamilyFont_fontStyle));

        String filename = array.getString(R.styleable.FontFamilyFont_font);

        array.recycle();

        return new FontConfig.Font(filename, 0, null, weight, isItalic);

    }



    private static void skip(XmlPullParser parser) throws XmlPullParserException, IOException {

        int depth = 1;

        while (depth > 0) {

            switch (parser.next()) {

                case XmlPullParser.START_TAG:

                    depth++;

                    break;

                case XmlPullParser.END_TAG:

                    depth--;

                    break;

            }

        }

    }

}