summaryrefslogtreecommitdiff
path: root/core/java/android/text/StaticLayout.java
diff options
context:
space:
mode:
authorSeigo Nonaka <nona@google.com>2017-08-31 18:22:38 -0700
committerSeigo Nonaka <nona@google.com>2017-09-27 18:54:03 -0700
commit44a1df2cf3857692ca95149d4fa70017982f2211 (patch)
treee59e85a3eb37a1528e7ddb24102e09e0a6494048 /core/java/android/text/StaticLayout.java
parent6070e803483dea97ceba25f83d516264a501ab1e (diff)
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
Diffstat (limited to 'core/java/android/text/StaticLayout.java')
-rw-r--r--core/java/android/text/StaticLayout.java4
1 files changed, 0 insertions, 4 deletions
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,