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

Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev am: 990e26118d am: 6fe1ab7f21

Browse Source 
am: af57bd751f

* commit 'af57bd751f9402a54db3cb60dd7c93a8106ae2b0':
  Revert "Fix TextView layout reuse when maxLines is set"

Change-Id: I6c4865dceff4debb17e679a67ffbb3d7eb33f817
This commit is contained in:
Siyamed Sinir
2016-05-27 23:40:53 +00:00
committed by android-build-merger
parent 7d94537ebd af57bd751f
commit 06ce394edc
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6980,19 +6980,14 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
return false;
}
private static int desired(Layout layout, int maxLines) {
private static int desired(Layout layout) {
int n = layout.getLineCount();
CharSequence text = layout.getText();
float max = 0;
// if maxLines is set, and the text length is greater that the length of the text in the
// layout, it means that there is a cut-off and we cannot use it.
if (maxLines != -1 && text.length() > layout.getLineEnd(n - 1)) {
return -1;
}
// if any line was wrapped, we can't use it.
// but it's ok for the last line not to have a newline
for (int i = 0; i < n - 1; i++) {
if (text.charAt(layout.getLineEnd(i) - 1) != '\n')
return -1;
@@ -7065,7 +7060,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
width = widthSize;
} else {
if (mLayout != null && mEllipsize == null) {
des = desired(mLayout, getMaxLines());
des = desired(mLayout);
}
if (des < 0) {
@@ -7097,7 +7092,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
int hintWidth;
if (mHintLayout != null && mEllipsize == null) {
hintDes = desired(mHintLayout, getMaxLines());
hintDes = desired(mHintLayout);
}
if (hintDes < 0) {