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

am eea94f06: Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev

Browse Source 
* commit 'eea94f060a917a5c6195a81d8825551a430a8d69':
  Revert "Followon fix for 14276128 Clipping at bottom of TextView"
This commit is contained in:
Yuling Liang
2014-04-25 17:35:52 +00:00
committed by Android Git Automerger
parent 60f8349b98 eea94f060a
commit 69a9d92502
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/text/StaticLayout.java
View File

@@ -633,11 +633,7 @@ public class StaticLayout extends Layout {
bottom = fm.bottom;
}
boolean firstLine = (j == 0);
boolean currentLineIsTheLastVisibleOne = (j + 1 == mMaximumVisibleLineCount);
boolean lastLine = currentLineIsTheLastVisibleOne || (end == bufEnd);
if (firstLine) {
if (j == 0) {
if (trackPad) {
mTopPadding = top - above;
}
@@ -646,10 +642,7 @@ public class StaticLayout extends Layout {
above = top;
}
}
int extra;
if (lastLine) {
if (end == bufEnd) {
if (trackPad) {
mBottomPadding = bottom - below;
}
@@ -659,8 +652,9 @@ public class StaticLayout extends Layout {
}
}
int extra;
if (needMultiply && !lastLine) {
if (needMultiply && end != bufEnd) {
double ex = (below - above) * (spacingmult - 1) + spacingadd;
if (ex >= 0) {
extra = (int)(ex + EXTRA_ROUNDING);
@@ -697,6 +691,8 @@ public class StaticLayout extends Layout {
if (ellipsize != null) {
// If there is only one line, then do any type of ellipsis except when it is MARQUEE
// if there are multiple lines, just allow END ellipsis on the last line
boolean firstLine = (j == 0);
boolean currentLineIsTheLastVisibleOne = (j + 1 == mMaximumVisibleLineCount);
boolean forceEllipsis = moreChars && (mLineCount + 1 == mMaximumVisibleLineCount);
boolean doEllipsis =