Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5362f273 authored by Roozbeh Pournader's avatar Roozbeh Pournader Committed by Android (Google) Code Review
Browse files

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

parents 70ea8578 431e506b

core/java/android/text/StaticLayout.java

+4 −2
Original line number Diff line number Diff line
@@ -627,7 +627,9 @@ public class StaticLayout extends Layout { 


                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 ||

                        chooseHtv.length < chooseHt.length) {

                        chooseHtv = ArrayUtils.newUnpaddedIntArray(chooseHt.length);