diff options
| author | Seigo Nonaka <nona@google.com> | 2017-09-28 14:03:08 -0700 |
|---|---|---|
| committer | Seigo Nonaka <nona@google.com> | 2017-09-29 20:11:19 +0000 |
| commit | e9f4ab5de71700ce936eb8089db6459c46c79acf (patch) | |
| tree | 2b42e9f4570ab35ebe83560e7a7e428bb7d550d6 /core/java/android/text/StaticLayout.java | |
| parent | 9c99f3257c51c6d02aab9e9f1c18030ee6b15146 (diff) | |
Remove StaticLayout.addMeasuredRun
StaticLayout.addMeasuredRun is used if the TextPaint is subclassed.
However, developers can't do almost anything by subclassing TextPaint
since most of default things are done in native code. So we don't need to
support this tricky case anymore.
Bug: 65024629
Bug: 67009717
Test: bit FrameworksCoreTests:android.text.StaticLayoutLineBreakingTest
Change-Id: I290b8b7d3e1fcff7be78e4bd1e620d6c188a10ad
Diffstat (limited to 'core/java/android/text/StaticLayout.java')
| -rw-r--r-- | core/java/android/text/StaticLayout.java | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index e71ad5b21fcf..e2c31de4d77f 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -431,7 +431,6 @@ public class StaticLayout extends Layout { * Then, for each run within the paragraph: * - one of the following, depending on the type of run: * + addStyleRun (a text run, to be measured in native code) - * + addMeasuredRun (a run already measured in Java, passed into native code) * + addReplacementRun (a replacement run, width is given) * * After measurement, nGetWidths() is valid if the widths are needed (eg for ellipsis). @@ -460,11 +459,6 @@ public class StaticLayout extends Layout { locHyph.first, locHyph.second); } - /* package */ void addMeasuredRun(TextPaint paint, int start, int end, float[] widths) { - Pair<String, long[]> locHyph = getLocaleAndHyphenatorIfChanged(paint); - nAddMeasuredRun(mNativePtr, start, end, widths, locHyph.first, locHyph.second); - } - /* package */ void addReplacementRun(TextPaint paint, int start, int end, float width) { Pair<String, long[]> locHyph = getLocaleAndHyphenatorIfChanged(paint); nAddReplacementRun(mNativePtr, start, end, width, locHyph.first, locHyph.second); @@ -1552,10 +1546,6 @@ public class StaticLayout extends Layout { @IntRange(from = 0) int start, @IntRange(from = 0) int end, boolean isRtl, @Nullable String languageTags, @Nullable long[] hyphenators); - private static native void nAddMeasuredRun(/* non-zero */ long nativePtr, - @IntRange(from = 0) int start, @IntRange(from = 0) int end, @NonNull float[] widths, - @Nullable String languageTags, @Nullable long[] hyphenators); - private static native void nAddReplacementRun(/* non-zero */ long nativePtr, @IntRange(from = 0) int start, @IntRange(from = 0) int end, @FloatRange(from = 0.0f) float width, @Nullable String languageTags, |