Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev (40b0d4d7) · Commits · e / os / android_frameworks_base

core/java/android/text/StaticLayout.java

+5 −14

Original line number	Original line	Diff line number	Diff line
	@@ -380,7 +380,7 @@ public class StaticLayout extends Layout {
	okBottom = fitBottom;		okBottom = fitBottom;
	}		}
	} else {		} else {
	final boolean moreChars;		final boolean moreChars = (j + 1 < spanEnd);
	int endPos;		int endPos;
	int above, below, top, bottom;		int above, below, top, bottom;
	float currentTextWidth;		float currentTextWidth;
	@@ -392,7 +392,6 @@ public class StaticLayout extends Layout {
	top = okTop;		top = okTop;
	bottom = okBottom;		bottom = okBottom;
	currentTextWidth = okWidth;		currentTextWidth = okWidth;
	moreChars = (j + 1 < spanEnd);
	} else if (fit != here) {		} else if (fit != here) {
	endPos = fit;		endPos = fit;
	above = fitAscent;		above = fitAscent;
	@@ -400,21 +399,13 @@ public class StaticLayout extends Layout {
	top = fitTop;		top = fitTop;
	bottom = fitBottom;		bottom = fitBottom;
	currentTextWidth = fitWidth;		currentTextWidth = fitWidth;
	moreChars = (j + 1 < spanEnd);
	} else {		} else {
	// must make progress, so take next character
	endPos = here + 1;		endPos = here + 1;
	// but to deal properly with clusters		above = fm.ascent;
	// take all zero width characters following that		below = fm.descent;
	while (endPos < spanEnd && widths[endPos - paraStart] == 0) {		top = fm.top;
	endPos++;		bottom = fm.bottom;
	}
	above = fmAscent;
	below = fmDescent;
	top = fmTop;
	bottom = fmBottom;
	currentTextWidth = widths[here - paraStart];		currentTextWidth = widths[here - paraStart];
	moreChars = (endPos < spanEnd);
	}		}

	v = out(source, here, endPos,		v = out(source, here, endPos,