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

Commit c48d2f78 authored by Raph Levien's avatar Raph Levien Committed by Android Git Automerger
Browse files

am ab30f486: am fa8570bc: am 7026617e: am 1fcb6d3a: Merge "Respect style... 

am ab30f486: am fa8570bc: am 7026617e: am 1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev

* commit 'ab30f486':
  Respect style boundaries when measuring text
parents 2950da34 ab30f486

core/java/android/text/TextLine.java

+2 −2
Original line number Diff line number Diff line
@@ -741,11 +741,11 @@ class TextLine { 


        if (needWidth || (c != null && (wp.bgColor != 0 || wp.underlineColor != 0 || runIsRtl))) {

            if (mCharsValid) {

                ret = wp.getRunAdvance(mChars, start, contextEnd, contextStart, contextEnd,

                ret = wp.getRunAdvance(mChars, start, end, contextStart, contextEnd,

                        runIsRtl, end);

            } else {

                int delta = mStart;

                ret = wp.getRunAdvance(mText, delta + start, delta + contextEnd,

                ret = wp.getRunAdvance(mText, delta + start, delta + end,

                        delta + contextStart, delta + contextEnd, runIsRtl, delta + end);

            }

        }