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

Merge "Apply correct bottom padding to layouts" into nyc-dev

Browse Source
This commit is contained in:
Raph Levien
2016-04-06 15:52:54 +00:00
committed by Android (Google) Code Review
parent fa305fcc6b 07e6c237d3
commit 6cfecf4dff
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/text/BoringLayout.java
View File

@@ -183,8 +183,10 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback
if (includepad) {
spacing = metrics.bottom - metrics.top;
mDesc = metrics.bottom;
} else {
spacing = metrics.descent - metrics.ascent;
mDesc = metrics.descent;
}
mBottom = spacing;
@@ -208,8 +210,6 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback
mTopPadding = metrics.top - metrics.ascent;
mBottomPadding = metrics.bottom - metrics.descent;
}
mDesc = spacing + mBottomPadding + (includepad ? metrics.top : metrics.ascent);
}
/**

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

@@ -1132,22 +1132,12 @@ public class StaticLayout extends Layout {
@Override
public int getLineTop(int line) {
int top = mLines[mColumns * line + TOP];
if (mMaximumVisibleLineCount > 0 && line >= mMaximumVisibleLineCount &&
line != mLineCount) {
top += getBottomPadding();
}
return top;
return mLines[mColumns * line + TOP];
}
@Override
public int getLineDescent(int line) {
int descent = mLines[mColumns * line + DESCENT];
if (mMaximumVisibleLineCount > 0 && line >= mMaximumVisibleLineCount - 1 && // -1 intended
line != mLineCount) {
descent += getBottomPadding();
}
return descent;
return mLines[mColumns * line + DESCENT];
}
@Override