Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev (eea94f06) · Commits · e / os / android_frameworks_base

core/java/android/text/StaticLayout.java

+6 −10

Original line number	Diff line number	Diff line
		@@ -633,11 +633,7 @@ public class StaticLayout extends Layout {
		bottom = fm.bottom;
		}

		boolean firstLine = (j == 0);
		boolean currentLineIsTheLastVisibleOne = (j + 1 == mMaximumVisibleLineCount);
		boolean lastLine = currentLineIsTheLastVisibleOne \|\| (end == bufEnd);

		if (firstLine) {
		if (j == 0) {
		if (trackPad) {
		mTopPadding = top - above;
		}
		@@ -646,10 +642,7 @@ public class StaticLayout extends Layout {
		above = top;
		}
		}

		int extra;

		if (lastLine) {
		if (end == bufEnd) {
		if (trackPad) {
		mBottomPadding = bottom - below;
		}
		@@ -659,8 +652,9 @@ public class StaticLayout extends Layout {
		}
		}

		int extra;

		if (needMultiply && !lastLine) {
		if (needMultiply && end != bufEnd) {
		double ex = (below - above) * (spacingmult - 1) + spacingadd;
		if (ex >= 0) {
		extra = (int)(ex + EXTRA_ROUNDING);
		@@ -697,6 +691,8 @@ public class StaticLayout extends Layout {
		if (ellipsize != null) {
		// If there is only one line, then do any type of ellipsis except when it is MARQUEE
		// if there are multiple lines, just allow END ellipsis on the last line
		boolean firstLine = (j == 0);
		boolean currentLineIsTheLastVisibleOne = (j + 1 == mMaximumVisibleLineCount);
		boolean forceEllipsis = moreChars && (mLineCount + 1 == mMaximumVisibleLineCount);

		boolean doEllipsis =