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

Commit e86c5b2e authored by Xavier Ducrohet's avatar Xavier Ducrohet Committed by Android (Google) Code Review
Browse files

Merge "Add missing delegate to the layoutlib."

parents 157c74e7 fc511683

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

+4 −0
Original line number Diff line number Diff line
@@ -138,6 +138,10 @@ public class ICU_Delegate { 
        return "";

    }



    @LayoutlibDelegate

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

        return "";

    }



    @LayoutlibDelegate

    /*package*/ static String[] getISOLanguagesNative() {

tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public class BridgeXmlBlockParserTest extends TestCase { 
    public void testXmlBlockParser() throws Exception {



        XmlPullParser parser = ParserFactory.create(

                getClass().getResourceAsStream("com/android/layoutlib/testdata/layout1.xml"),

                getClass().getResourceAsStream("/com/android/layoutlib/testdata/layout1.xml"),

                        "layout1.xml");



        parser = new BridgeXmlBlockParser(parser, null, false /* platformResourceFlag */);