From 44a1df2cf3857692ca95149d4fa70017982f2211 Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Thu, 31 Aug 2017 18:22:38 -0700 Subject: Keep locale info in Hyphenator. Even if the same data file is used, different hyphenation is applied based on the locale. Now Hyphenator keeps locale and use it for hyphenation. Bug: 65024629 Test: bit CtsTextTestCases:android.text.cts.StaticLayoutTest Test: bit CtsTextTestCases:android.text.cts.DynamicLayoutTest Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest Change-Id: I7e2ece979181d12ac1adbede14995ec9b7b87d21 --- core/java/android/text/StaticLayout.java | 4 ---- 1 file changed, 4 deletions(-) (limited to 'core/java/android/text/StaticLayout.java') diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index 8e0ad6352081..b6911fe8cb29 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -33,7 +33,6 @@ import android.util.Pools.SynchronizedPool; import com.android.internal.util.ArrayUtils; import com.android.internal.util.GrowingArrayUtils; -import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Locale; @@ -1529,9 +1528,6 @@ public class StaticLayout extends Layout { private static native void nFreeBuilder(long nativePtr); private static native void nFinishBuilder(long nativePtr); - /* package */ static native long nLoadHyphenator(ByteBuffer buf, int offset, - int minPrefix, int minSuffix); - // Set up paragraph text and settings; done as one big method to minimize jni crossings private static native void nSetupParagraph( /* non zero */ long nativePtr, @NonNull char[] text, @IntRange(from = 0) int length, -- cgit v1.2.3