Merge "Ellipsized and Non-ellipsized baselines should be same." into nyc-dev (afe3cd1a) · Commits · e / os / android_frameworks_base

core/java/android/text/BoringLayout.java

+2 −6

Original line number	Original line	Diff line number	Diff line
	@@ -189,12 +189,6 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback

	mBottom = spacing;		mBottom = spacing;

	if (includepad) {
	mDesc = spacing + metrics.top;
	} else {
	mDesc = spacing + metrics.ascent;
	}

	if (trustWidth) {		if (trustWidth) {
	mMax = metrics.width;		mMax = metrics.width;
	} else {		} else {
	@@ -214,6 +208,8 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback
	mTopPadding = metrics.top - metrics.ascent;		mTopPadding = metrics.top - metrics.ascent;
	mBottomPadding = metrics.bottom - metrics.descent;		mBottomPadding = metrics.bottom - metrics.descent;
	}		}

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

	/**		/**

core/java/android/widget/TextView.java

+7 −6

Original line number	Original line	Diff line number	Diff line
	@@ -6853,11 +6853,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
	.setLineSpacing(mSpacingAdd, mSpacingMult)		.setLineSpacing(mSpacingAdd, mSpacingMult)
	.setIncludePad(mIncludePad)		.setIncludePad(mIncludePad)
	.setBreakStrategy(mBreakStrategy)		.setBreakStrategy(mBreakStrategy)
	.setHyphenationFrequency(mHyphenationFrequency);		.setHyphenationFrequency(mHyphenationFrequency)
			.setMaxLines(mMaxMode == LINES ? mMaximum : Integer.MAX_VALUE);
	if (shouldEllipsize) {		if (shouldEllipsize) {
	builder.setEllipsize(mEllipsize)		builder.setEllipsize(mEllipsize)
	.setEllipsizedWidth(ellipsisWidth)		.setEllipsizedWidth(ellipsisWidth);
	.setMaxLines(mMaxMode == LINES ? mMaximum : Integer.MAX_VALUE);
	}		}
	mHintLayout = builder.build();		mHintLayout = builder.build();
	}		}
	@@ -6944,11 +6944,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
	.setLineSpacing(mSpacingAdd, mSpacingMult)		.setLineSpacing(mSpacingAdd, mSpacingMult)
	.setIncludePad(mIncludePad)		.setIncludePad(mIncludePad)
	.setBreakStrategy(mBreakStrategy)		.setBreakStrategy(mBreakStrategy)
	.setHyphenationFrequency(mHyphenationFrequency);		.setHyphenationFrequency(mHyphenationFrequency)
			.setMaxLines(mMaxMode == LINES ? mMaximum : Integer.MAX_VALUE);
	if (shouldEllipsize) {		if (shouldEllipsize) {
	builder.setEllipsize(effectiveEllipsize)		builder.setEllipsize(effectiveEllipsize)
	.setEllipsizedWidth(ellipsisWidth)		.setEllipsizedWidth(ellipsisWidth);
	.setMaxLines(mMaxMode == LINES ? mMaximum : Integer.MAX_VALUE);
	}		}
	// TODO: explore always setting maxLines		// TODO: explore always setting maxLines
	result = builder.build();		result = builder.build();