Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Implement LineBreaker callback and fix indent repeating."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-31 01:41:01 +00:00
committed by Android (Google) Code Review
parent d65901b5a0 749e57e5c3
commit ed82b166e7
3 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/text/StaticLayout.java
View File

@@ -780,9 +780,7 @@ public class StaticLayout extends Layout {
firstWidth, firstWidthLineCount, restWidth,
variableTabStops, TAB_INCREMENT, b.mBreakStrategy, b.mHyphenationFrequency,
// TODO: Support more justification mode, e.g. letter spacing, stretching.
b.mJustificationMode != Layout.JUSTIFICATION_MODE_NONE,
(indents != null && indents.length > mLineCount) ? indents : null,
mLineCount);
b.mJustificationMode != Layout.JUSTIFICATION_MODE_NONE, indents, mLineCount);
// measurement has to be done before performing line breaking
// but we don't want to recompute fontmetrics or span ranges the
@@ -1506,7 +1504,7 @@ public class StaticLayout extends Layout {
@FloatRange(from = 0.0f) float restWidth, @Nullable int[] variableTabStops,
int defaultTabStop, @BreakStrategy int breakStrategy,
@HyphenationFrequency int hyphenationFrequency, boolean isJustified,
@Nullable int[] indents, @IntRange(from = 0) int intentsOffset);
@Nullable int[] indents, @IntRange(from = 0) int indentsOffset);
private static native float nAddStyleRun(long nativePtr, long nativePaint, int start, int end,
boolean isRtl);