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 am: 92d0316d28

Browse Source 
am: 361f03c4e2

* commit '361f03c4e2c774c074ef98ab2631e28288690034':
  Set StaticLayout.maxLines only when ellipsize is set

Change-Id: I15d616a7b448dc8e63c1a7d0ac136be98669a869
This commit is contained in:
Siyamed Sinir
2016-05-27 18:55:30 +00:00
committed by android-build-merger
parent 1099ea59c5 361f03c4e2
commit 3e7177f91f
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)
.setIncludePad(mIncludePad)
.setBreakStrategy(mBreakStrategy)
.setHyphenationFrequency(mHyphenationFrequency)
.setMaxLines(mMaxMode == LINES ? mMaximum : Integer.MAX_VALUE);
.setHyphenationFrequency(mHyphenationFrequency);
if (shouldEllipsize) {
builder.setEllipsize(mEllipsize)
.setEllipsizedWidth(ellipsisWidth);
.setEllipsizedWidth(ellipsisWidth)
.setMaxLines(mMaxMode == LINES ? mMaximum : Integer.MAX_VALUE);
}
mHintLayout = builder.build();
}
@@ -6948,12 +6948,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
.setLineSpacing(mSpacingAdd, mSpacingMult)
.setIncludePad(mIncludePad)
.setBreakStrategy(mBreakStrategy)
.setHyphenationFrequency(mHyphenationFrequency)
.setMaxLines(mMaxMode == LINES ? mMaximum : Integer.MAX_VALUE);
.setHyphenationFrequency(mHyphenationFrequency);
if (shouldEllipsize) {
builder.setEllipsize(effectiveEllipsize)
.setEllipsizedWidth(ellipsisWidth);
.setEllipsizedWidth(ellipsisWidth)
.setMaxLines(mMaxMode == LINES ? mMaximum : Integer.MAX_VALUE);
}
// TODO: explore always setting maxLines
result = builder.build();