diff options
| author | Raph Levien <raph@google.com> | 2015-06-01 21:41:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-01 21:56:36 +0000 |
| commit | fb2cdc4ca131ff95179414854eca02a098a29a8a (patch) | |
| tree | 3a224e1e55c487ef1da8eeee81d75bd030ae3903 | |
| parent | e0e5c1cf1965302fcf177eaade372313504ea53a (diff) | |
| parent | edb27f14ec03d9f4e1dd3959e81f58d4f1389971 (diff) | |
| download | frameworks_base-fb2cdc4ca131ff95179414854eca02a098a29a8a.zip frameworks_base-fb2cdc4ca131ff95179414854eca02a098a29a8a.tar.gz frameworks_base-fb2cdc4ca131ff95179414854eca02a098a29a8a.tar.bz2 | |
Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev
| -rw-r--r-- | core/java/android/text/Layout.java | 1 | ||||
| -rw-r--r-- | core/java/android/text/TextLine.java | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index f176240..f7027f9 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -1121,6 +1121,7 @@ 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); diff --git a/core/java/android/text/TextLine.java b/core/java/android/text/TextLine.java index 479242c..605b91d 100644 --- a/core/java/android/text/TextLine.java +++ b/core/java/android/text/TextLine.java @@ -739,16 +739,14 @@ class TextLine { float ret = 0; - int contextLen = contextEnd - contextStart; if (needWidth || (c != null && (wp.bgColor != 0 || wp.underlineColor != 0 || runIsRtl))) { if (mCharsValid) { - ret = wp.getTextRunAdvances(mChars, start, runLen, - contextStart, contextLen, runIsRtl, null, 0); + ret = wp.getRunAdvance(mChars, start, contextEnd, contextStart, contextEnd, + runIsRtl, end); } else { int delta = mStart; - ret = wp.getTextRunAdvances(mText, delta + start, - delta + end, delta + contextStart, delta + contextEnd, - runIsRtl, null, 0); + ret = wp.getRunAdvance(mText, delta + start, delta + contextEnd, + delta + contextStart, delta + contextEnd, runIsRtl, delta + end); } } |