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

am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev

Browse Source 
* commit '5362f273e91885041b7cb246667cff3ceca74703':
  Fix line height problem with inline images in StaticLayout.
This commit is contained in:
Roozbeh Pournader
2015-10-16 22:01:49 +00:00
committed by Android Git Automerger
parent 85fae34e81 5362f273e9
commit b3538082d7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -627,7 +627,9 @@ public class StaticLayout extends Layout {
chooseHt = getParagraphSpans(spanned, paraStart, paraEnd, LineHeightSpan.class); chooseHt = getParagraphSpans(spanned, paraStart, paraEnd, LineHeightSpan.class);
if (chooseHt.length != 0) { if (chooseHt.length == 0) {
chooseHt = null; // So that out() would not assume it has any contents
} else {
if (chooseHtv == null || if (chooseHtv == null ||
chooseHtv.length < chooseHt.length) { chooseHtv.length < chooseHt.length) {
chooseHtv = ArrayUtils.newUnpaddedIntArray(chooseHt.length); chooseHtv = ArrayUtils.newUnpaddedIntArray(chooseHt.length);
@@ -810,7 +812,7 @@ public class StaticLayout extends Layout {
v = out(source, here, endPos, v = out(source, here, endPos,
fmAscent, fmDescent, fmTop, fmBottom, fmAscent, fmDescent, fmTop, fmBottom,
v, spacingmult, spacingadd, chooseHt,chooseHtv, fm, flags[breakIndex], v, spacingmult, spacingadd, chooseHt, chooseHtv, fm, flags[breakIndex],
needMultiply, chdirs, dir, easy, bufEnd, includepad, trackpad, needMultiply, chdirs, dir, easy, bufEnd, includepad, trackpad,
chs, widths, paraStart, ellipsize, ellipsizedWidth, chs, widths, paraStart, ellipsize, ellipsizedWidth,
lineWidths[breakIndex], paint, moreChars); lineWidths[breakIndex], paint, moreChars);