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

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

Merge "Update layoutlib following Change Ia12d448a"

parents 19f1844e 013edba6

tools/layoutlib/bridge/src/android/text/Hyphenator_Delegate.java

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public class Hyphenator_Delegate { 
    }



    /*package*/ @SuppressWarnings("UnusedParameters")  // TODO implement this.

    static long loadHyphenator(ByteBuffer buffer, int offset) {

    static long loadHyphenator(ByteBuffer buffer, int offset, int minPrefix, int minSuffix) {

        return sDelegateManager.addNewDelegate(new Hyphenator_Delegate());

    }

}

tools/layoutlib/bridge/src/android/text/StaticLayout_Delegate.java

+3 −2
Original line number Diff line number Diff line
@@ -53,8 +53,9 @@ public class StaticLayout_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static long nLoadHyphenator(ByteBuffer buf, int offset) {

        return Hyphenator_Delegate.loadHyphenator(buf, offset);

    /*package*/ static long nLoadHyphenator(ByteBuffer buf, int offset, int minPrefix,

            int minSuffix) {

        return Hyphenator_Delegate.loadHyphenator(buf, offset, minPrefix, minSuffix);

    }



    @LayoutlibDelegate