Merge "Apply correct bottom padding to layouts" into nyc-dev am: 6cfecf4 (5481a74d) · Commits · e / os / android_frameworks_base

core/java/android/text/BoringLayout.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -183,8 +183,10 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback

		if (includepad) {
		spacing = metrics.bottom - metrics.top;
		mDesc = metrics.bottom;
		} else {
		spacing = metrics.descent - metrics.ascent;
		mDesc = metrics.descent;
		}

		mBottom = spacing;
		@@ -208,8 +210,6 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback
		mTopPadding = metrics.top - metrics.ascent;
		mBottomPadding = metrics.bottom - metrics.descent;
		}

		mDesc = spacing + mBottomPadding + (includepad ? metrics.top : metrics.ascent);
		}

		/**

+2 −12

Original line number	Diff line number	Diff line
		@@ -1132,22 +1132,12 @@ public class StaticLayout extends Layout {

		@Override
		public int getLineTop(int line) {
		int top = mLines[mColumns * line + TOP];
		if (mMaximumVisibleLineCount > 0 && line >= mMaximumVisibleLineCount &&
		line != mLineCount) {
		top += getBottomPadding();
		}
		return top;
		return mLines[mColumns * line + TOP];
		}

		@Override
		public int getLineDescent(int line) {
		int descent = mLines[mColumns * line + DESCENT];
		if (mMaximumVisibleLineCount > 0 && line >= mMaximumVisibleLineCount - 1 && // -1 intended
		line != mLineCount) {
		descent += getBottomPadding();
		}
		return descent;
		return mLines[mColumns * line + DESCENT];
		}

		@Override