diff options
| author | Seigo Nonaka <nona@google.com> | 2017-10-02 16:01:14 -0700 |
|---|---|---|
| committer | Seigo Nonaka <nona@google.com> | 2017-10-03 17:48:52 +0000 |
| commit | 5cc9348e9e37dba72d69d614c330687d1ce548a5 (patch) | |
| tree | 32698f0f20e6446e9f2570dc2533afbacc6fcbc0 /core/java/android/text/StaticLayout.java | |
| parent | 4cea4304bd676a380098010a60c20c4901bc8f85 (diff) | |
Stop returning run width of StaticLayout.Builder.addStyleRun.
The return value of addStyleRun is not used.
By no longer returning run width, the LineBreaker can defer the
style and line breaking calculation.
Bug: 65024629
Test: bit CtsTextTestCases:*
Change-Id: I2c835ff1c58657863da12976e71007c29b1bb039
Diffstat (limited to 'core/java/android/text/StaticLayout.java')
| -rw-r--r-- | core/java/android/text/StaticLayout.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index e2c31de4d77f..961cd8eef530 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -453,10 +453,10 @@ public class StaticLayout extends Layout { } } - /* package */ float addStyleRun(TextPaint paint, int start, int end, boolean isRtl) { + /* package */ void addStyleRun(TextPaint paint, int start, int end, boolean isRtl) { Pair<String, long[]> locHyph = getLocaleAndHyphenatorIfChanged(paint); - return nAddStyleRun(mNativePtr, paint.getNativeInstance(), start, end, isRtl, - locHyph.first, locHyph.second); + nAddStyleRun(mNativePtr, paint.getNativeInstance(), start, end, isRtl, locHyph.first, + locHyph.second); } /* package */ void addReplacementRun(TextPaint paint, int start, int end, float width) { @@ -1541,7 +1541,7 @@ public class StaticLayout extends Layout { @Nullable int[] indents, @Nullable int[] leftPaddings, @Nullable int[] rightPaddings, @IntRange(from = 0) int indentsOffset); - private static native float nAddStyleRun( + private static native void nAddStyleRun( /* non-zero */ long nativePtr, /* non-zero */ long nativePaint, @IntRange(from = 0) int start, @IntRange(from = 0) int end, boolean isRtl, @Nullable String languageTags, @Nullable long[] hyphenators); |
