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

Commit e5ad073d authored by Deepanshu Gupta's avatar Deepanshu Gupta
Browse files

resolved conflicts for merge of c76345a3 to klp-dev-plus-aosp 

Change-Id: I54e14e1c6cd53cd10b38b34cf31989a2aa487b83
parents acccf836 c76345a3

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

+4 −4
Original line number Diff line number Diff line
@@ -401,17 +401,17 @@ public final class Path_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static void native_addPath(long nPath, int src, float dx, float dy) {

    /*package*/ static void native_addPath(long nPath, long src, float dx, float dy) {

        addPath(nPath, src, AffineTransform.getTranslateInstance(dx, dy));

    }



    @LayoutlibDelegate

    /*package*/ static void native_addPath(long nPath, int src) {

    /*package*/ static void native_addPath(long nPath, long src) {

        addPath(nPath, src, null /*transform*/);

    }



    @LayoutlibDelegate

    /*package*/ static void native_addPath(long nPath, int src, long matrix) {

    /*package*/ static void native_addPath(long nPath, long src, long matrix) {

        Matrix_Delegate matrixDelegate = Matrix_Delegate.getDelegate(matrix);

        if (matrixDelegate == null) {

            return;
@@ -474,7 +474,7 @@ public final class Path_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static boolean native_op(long nPath1, long nPath2, int op, int result) {

    /*package*/ static boolean native_op(long nPath1, long nPath2, int op, long result) {

        Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED, "Path.op() not supported", null);

        return false;

    }

tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java

+16 −0
Original line number Diff line number Diff line
@@ -136,6 +136,11 @@ public class ICU_Delegate { 
        return "";

    }



    @LayoutlibDelegate

    /*package*/ static String getDisplayScriptNative(String variantCode, String locale) {

        return "";

    }



    @LayoutlibDelegate

    /*package*/ static String getISO3CountryNative(String locale) {

        return "";
@@ -166,6 +171,17 @@ public class ICU_Delegate { 
        return Locale.getISOCountries();

    }





    @LayoutlibDelegate

    /*package*/ static String localeForLanguageTag(String languageTag, boolean strict) {

        return "";

    }



    @LayoutlibDelegate

    /*package*/ static String languageTagForLocale(String locale) {

        return "";

    }



    @LayoutlibDelegate

    /*package*/ static boolean initLocaleDataNative(String locale, LocaleData result) {