diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-09-30 00:16:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-09-30 00:16:19 +0000 |
| commit | 085683fb215feb250be624da1805bca3734811c7 (patch) | |
| tree | c842b99461e952f3e0757a5b10fba7119010324e /core/java/android/text/StaticLayout.java | |
| parent | 667ded2fc9b12d599e7fcbe7c2d490fc4304e83f (diff) | |
| parent | e9f4ab5de71700ce936eb8089db6459c46c79acf (diff) | |
Merge "Remove StaticLayout.addMeasuredRun"
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, |