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

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

Browse Source 
* commit '0221328c3381680631d783c2b9733430f8b0555d':
  Fix line height problem with inline images in StaticLayout.
This commit is contained in:
Roozbeh Pournader
2015-10-16 22:12:46 +00:00
committed by Android Git Automerger
parent 2de89ae843 0221328c33
commit ebdf60e7c8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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);