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

Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev

Browse Source
This commit is contained in:
Siyamed Sinir
2016-05-27 18:34:27 +00:00
committed by Android (Google) Code Review
parent 7f1330358a 24aba4b9e9
commit 92d0316d28
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6857,11 +6857,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();
} }
@@ -6948,12 +6948,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(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();