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

Commit 0221328c authored by Roozbeh Pournader's avatar Roozbeh Pournader Committed by Android Git Automerger
Browse files

am b3538082: am 5362f273: Merge "Fix line height problem with inline images in... 

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

* commit 'b3538082':
  Fix line height problem with inline images in StaticLayout.
parents 3c439c72 b3538082

core/java/android/text/StaticLayout.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -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);