Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AutoSize TextView - fix measurements" into oc-dev

Browse Source
This commit is contained in:
Andrei Stingaceanu
2017-04-10 12:48:28 +00:00
committed by Android (Google) Code Review
parent 4286c5768d 549482bfcb
commit e812e7dc2e
1 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/widget/TextView.java
View File

@@ -8148,11 +8148,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
mTempTextPaint.set(getPaint()); mTempTextPaint.set(getPaint());
mTempTextPaint.setTextSize(suggestedSizeInPx); 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( final StaticLayout.Builder layoutBuilder = StaticLayout.Builder.obtain(
text, 0, text.length(), mTempTextPaint, text, 0, text.length(), mTempTextPaint,
getMeasuredWidth() - getTotalPaddingLeft() - getTotalPaddingRight()); getMeasuredWidth() - getTotalPaddingLeft() - getTotalPaddingRight());
@@ -8177,7 +8172,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
if (layout.getHeight() > availableSpace.bottom) { if (layout.getHeight() > availableSpace.bottom) {
return false; return false;
} }
}
return true; return true;
} }