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

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

am 590e3221: am c73314bc: am cf8b3b1c: Merge "Revert "Use getRunAdvance to... 

am 590e3221: am c73314bc: am cf8b3b1c: Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev

* commit '590e3221':
  Revert "Use getRunAdvance to position cursor"
parents 8ea127f5 590e3221

core/java/android/text/Layout.java

+0 −1
Original line number Diff line number Diff line
@@ -1121,7 +1121,6 @@ public abstract class Layout { 
     * closest to the specified horizontal position.

     */

    public int getOffsetForHorizontal(int line, float horiz) {

        // TODO: use Paint.getOffsetForAdvance to avoid binary search

        int max = getLineEnd(line) - 1;

        int min = getLineStart(line);

        Directions dirs = getLineDirections(line);

core/java/android/text/TextLine.java

+6 −4
Original line number Diff line number Diff line
@@ -739,14 +739,16 @@ class TextLine { 


        float ret = 0;



        int contextLen = contextEnd - contextStart;

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

            if (mCharsValid) {

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

                        runIsRtl, end);

                ret = wp.getTextRunAdvances(mChars, start, runLen,

                        contextStart, contextLen, runIsRtl, null, 0);

            } else {

                int delta = mStart;

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

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

                ret = wp.getTextRunAdvances(mText, delta + start,

                        delta + end, delta + contextStart, delta + contextEnd,

                        runIsRtl, null, 0);

            }

        }