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

Commit cf8b3b1c authored by Raph Levien's avatar Raph Levien Committed by Android (Google) Code Review
Browse files

Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev

parents 061e2bbf 5730c974

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

            }

        }