Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 74437532: Merge "Fix for bug: Gmail (and other places): cursor placed on top of letter" into jb-mr1-dev

Browse Source 
* commit '74437532fe2a3e9ebd15c61327fd3f2b68c299b3':
  Fix for bug: Gmail (and other places): cursor placed on top of letter
This commit is contained in:
Raph Levien
2012-10-22 15:59:22 -07:00
committed by Android Git Automerger
parent 6534dd0275 74437532fe
commit 9defd0663e
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/java/android/text/TextLine.java
View File

@@ -939,27 +939,22 @@ class TextLine {
continue; continue;
} }
if (c == null) { for (int j = i, jnext; j < mlimit; j = jnext) {
x += handleText(wp, i, mlimit, i, inext, runIsRtl, c, x, top, jnext = mCharacterStyleSpanSet.getNextTransition(mStart + j, mStart + mlimit) -
y, bottom, fmi, needWidth || mlimit < measureLimit); mStart;
} else {
for (int j = i, jnext; j < mlimit; j = jnext) {
jnext = mCharacterStyleSpanSet.getNextTransition(mStart + j, mStart + mlimit) -
mStart;
wp.set(mPaint); wp.set(mPaint);
for (int k = 0; k < mCharacterStyleSpanSet.numberOfSpans; k++) { for (int k = 0; k < mCharacterStyleSpanSet.numberOfSpans; k++) {
// Intentionally using >= and <= as explained above // Intentionally using >= and <= as explained above
if ((mCharacterStyleSpanSet.spanStarts[k] >= mStart + jnext) || if ((mCharacterStyleSpanSet.spanStarts[k] >= mStart + jnext) ||
(mCharacterStyleSpanSet.spanEnds[k] <= mStart + j)) continue; (mCharacterStyleSpanSet.spanEnds[k] <= mStart + j)) continue;
CharacterStyle span = mCharacterStyleSpanSet.spans[k]; CharacterStyle span = mCharacterStyleSpanSet.spans[k];
span.updateDrawState(wp); span.updateDrawState(wp);
}
x += handleText(wp, j, jnext, i, inext, runIsRtl, c, x,
top, y, bottom, fmi, needWidth || jnext < measureLimit);
} }
x += handleText(wp, j, jnext, i, inext, runIsRtl, c, x,
top, y, bottom, fmi, needWidth || jnext < measureLimit);
} }
} }