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

Commit 724af9ce authored by Diego Perez's avatar Diego Perez Committed by android-build-merger
Browse files

Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev

am: 7dda46e7

* commit '7dda46e7':
  Update StaticLayout_Delegate to use new nLoadHyphenator
parents 9a4b6b90 7dda46e7
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -20,9 +20,10 @@ import com.android.layoutlib.bridge.impl.DelegateManager;
import com.android.tools.layoutlib.annotations.LayoutlibDelegate;

import java.io.File;
import java.nio.ByteBuffer;

/**
 * Delegate that overrides implementation for certain methods in {@link android.text.StaticLayout}
 * Delegate that overrides implementation for certain methods in {@link android.text.Hyphenator}
 * <p/>
 * Through the layoutlib_create tool, selected methods of StaticLayout have been replaced
 * by calls to methods of the same name in this delegate class.
@@ -38,7 +39,7 @@ public class Hyphenator_Delegate {
        return null;
    }

    /*package*/ static long loadHyphenator(String patternData) {
    /*package*/ static long loadHyphenator(ByteBuffer buf, int offset) {
        return sDelegateManager.addNewDelegate(new Hyphenator_Delegate());
    }
}
+3 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ import android.icu.util.ULocale;
import android.text.Primitive.PrimitiveType;
import android.text.StaticLayout.LineBreaks;

import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -52,8 +53,8 @@ public class StaticLayout_Delegate {
    }

    @LayoutlibDelegate
    /*package*/ static long nLoadHyphenator(String patternData) {
        return Hyphenator_Delegate.loadHyphenator(patternData);
    /*package*/ static long nLoadHyphenator(ByteBuffer buf, int offset) {
        return Hyphenator_Delegate.loadHyphenator(buf, offset);
    }

    @LayoutlibDelegate