Merge "AutoSize TextView - fix measurements" into oc-dev (e812e7dc) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+22 −28

Original line number	Diff line number	Diff line
		@@ -8148,11 +8148,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		mTempTextPaint.set(getPaint());
		mTempTextPaint.setTextSize(suggestedSizeInPx);

		if ((mLayout instanceof BoringLayout) && BoringLayout.isBoring(
		text, mTempTextPaint, getTextDirectionHeuristic(), mBoring) != null) {
		return mTempTextPaint.getFontSpacing() <= availableSpace.bottom
		&& mTempTextPaint.measureText(text, 0, text.length()) <= availableSpace.right;
		} else {
		final StaticLayout.Builder layoutBuilder = StaticLayout.Builder.obtain(
		text, 0, text.length(), mTempTextPaint,
		getMeasuredWidth() - getTotalPaddingLeft() - getTotalPaddingRight());
		@@ -8177,7 +8172,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		if (layout.getHeight() > availableSpace.bottom) {
		return false;
		}
		}

		return true;
		}