Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into...

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.Hyphenator}

 * Delegate that overrides implementation for certain methods in {@link android.text.StaticLayout}

 * <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.

        return null;

    }

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

    /*package*/ static long loadHyphenator(String patternData) {

        return sDelegateManager.addNewDelegate(new Hyphenator_Delegate());

    }

}

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;

    }

    @LayoutlibDelegate

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

        return Hyphenator_Delegate.loadHyphenator(buf, offset);

    /*package*/ static long nLoadHyphenator(String patternData) {

        return Hyphenator_Delegate.loadHyphenator(patternData);

    }

    @LayoutlibDelegate