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

Commit e34edfc8 authored by Jerome Gaillard's avatar Jerome Gaillard Committed by Android (Google) Code Review
Browse files

Merge "Update layoutlib following Changes I2500bd4c and If456266f"

parents 180f5e91 95f36e23

tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java

+6 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package android.graphics;



import android.text.FontConfig;

import com.android.ide.common.rendering.api.AssetRepository;

import com.android.ide.common.rendering.api.LayoutLog;

import com.android.layoutlib.bridge.Bridge;
@@ -293,12 +292,16 @@ public class FontFamily_Delegate { 


    @LayoutlibDelegate

    /*package*/ static boolean nAddFontWeightStyle(long builderPtr, ByteBuffer font,

            int ttcIndex, List<FontConfig.Axis> listOfAxis,

            int weight, boolean isItalic) {

            int ttcIndex, int weight, boolean isItalic) {

        assert false : "The only client of this method has been overriden.";

        return false;

    }



    @LayoutlibDelegate

    /*package*/ static void nAddAxisValue(long builderPtr, int tag, float value) {

        assert false : "The only client of this method has been overriden.";

    }



    static boolean addFont(long builderPtr, final String path, final int weight,

            final boolean isItalic) {

        final FontFamily_Delegate delegate = getDelegate(builderPtr);

tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java

+5 −4
Original line number Diff line number Diff line
@@ -964,8 +964,9 @@ public class Paint_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static int nGetTextRunCursor(Paint paint, long native_object, char[] text,

            int contextStart, int contextLength, int flags, int offset, int cursorOpt) {

    /*package*/ static int nGetTextRunCursor(Paint paint, long native_object, long typefacePtr,

            char[] text, int contextStart, int contextLength, int flags, int offset,

            int cursorOpt) {

        // FIXME

        Bridge.getLog().fidelityWarning(LayoutLog.TAG_UNSUPPORTED,

                "Paint.getTextRunCursor is not supported.", null, null /*data*/);
@@ -973,8 +974,8 @@ public class Paint_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static int nGetTextRunCursor(Paint paint, long native_object, String text,

            int contextStart, int contextEnd, int flags, int offset, int cursorOpt) {

    /*package*/ static int nGetTextRunCursor(Paint paint, long native_object, long typefacePtr,

            String text, int contextStart, int contextEnd, int flags, int offset, int cursorOpt) {

        // FIXME

        Bridge.getLog().fidelityWarning(LayoutLog.TAG_UNSUPPORTED,

                "Paint.getTextRunCursor is not supported.", null, null /*data*/);