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

Commit c000acd7 authored by Seigo Nonaka's avatar Seigo Nonaka Committed by android-build-merger
Browse files

Merge "Resolve styles by font table if not specified." into oc-dev 

am: 1ea3a260

Change-Id: I8c99a582e4453ec0dfbe6e30650b6682f68e255a
parents ad2f0735 1ea3a260

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

+9 −8
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.content.res; 
import com.android.internal.R;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.graphics.Typeface;

import android.util.AttributeSet;

import android.util.Log;

import android.util.Xml;
@@ -36,8 +37,6 @@ import java.util.List; 
 */

public class FontResourcesParser {

    private static final String TAG = "FontResourcesParser";

    private static final int NORMAL_WEIGHT = 400;

    private static final int ITALIC = 1;



    // A class represents single entry of font-family in xml file.

    public interface FamilyResourceEntry {}
@@ -78,10 +77,10 @@ public class FontResourcesParser { 
    public static final class FontFileResourceEntry {

        private final @NonNull String mFileName;

        private int mWeight;

        private boolean mItalic;

        private int mItalic;

        private int mResourceId;



        public FontFileResourceEntry(@NonNull String fileName, int weight, boolean italic) {

        public FontFileResourceEntry(@NonNull String fileName, int weight, int italic) {

            mFileName = fileName;

            mWeight = weight;

            mItalic = italic;
@@ -95,7 +94,7 @@ public class FontResourcesParser { 
            return mWeight;

        }



        public boolean isItalic() {

        public int getItalic() {

            return mItalic;

        }

    }
@@ -200,8 +199,10 @@ public class FontResourcesParser { 
            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 == array.getInt(R.styleable.FontFamilyFont_fontStyle, 0);

        int weight = array.getInt(R.styleable.FontFamilyFont_fontWeight,

                Typeface.RESOLVE_BY_FONT_TABLE);

        int italic = array.getInt(R.styleable.FontFamilyFont_fontStyle,

                Typeface.RESOLVE_BY_FONT_TABLE);

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

        array.recycle();

        while (parser.next() != XmlPullParser.END_TAG) {
@@ -210,7 +211,7 @@ public class FontResourcesParser { 
        if (filename == null) {

            return null;

        }

        return new FontFileResourceEntry(filename, weight, isItalic);

        return new FontFileResourceEntry(filename, weight, italic);

    }



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

core/tests/coretests/src/android/content/res/FontResourcesParserTest.java

+4 −4
Original line number Diff line number Diff line
@@ -68,19 +68,19 @@ public class FontResourcesParserTest { 
        assertEquals(4, fileEntries.length);

        FontFileResourceEntry font1 = fileEntries[0];

        assertEquals(400, font1.getWeight());

        assertEquals(false, font1.isItalic());

        assertEquals(0, font1.getItalic());

        assertEquals("res/font/samplefont.ttf", font1.getFileName());

        FontFileResourceEntry font2 = fileEntries[1];

        assertEquals(400, font2.getWeight());

        assertEquals(true, font2.isItalic());

        assertEquals(1, font2.getItalic());

        assertEquals("res/font/samplefont2.ttf", font2.getFileName());

        FontFileResourceEntry font3 = fileEntries[2];

        assertEquals(800, font3.getWeight());

        assertEquals(false, font3.isItalic());

        assertEquals(0, font3.getItalic());

        assertEquals("res/font/samplefont3.ttf", font3.getFileName());

        FontFileResourceEntry font4 = fileEntries[3];

        assertEquals(800, font4.getWeight());

        assertEquals(true, font4.isItalic());

        assertEquals(1, font4.getItalic());

        assertEquals("res/font/samplefont4.ttf", font4.getFileName());

    }

graphics/java/android/graphics/Typeface.java

+1 −2
Original line number Diff line number Diff line
@@ -233,8 +233,7 @@ public class Typeface { 
                // TODO: Add ttc and variation font support. (b/37853920)

                if (!fontFamily.addFontFromAssetManager(mgr, fontFile.getFileName(),

                        0 /* resourceCookie */, false /* isAsset */, 0 /* ttcIndex */,

                        fontFile.getWeight(), fontFile.isItalic() ? STYLE_ITALIC : STYLE_NORMAL,

                        null /* axes */)) {

                        fontFile.getWeight(), fontFile.getItalic(), null /* axes */)) {

                    return null;

                }

            }