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

Merge "Composing span is removed when insertion point is moved"

Browse Source
This commit is contained in:
Gilles Debunne
2011-02-17 17:04:46 -08:00
committed by Android (Google) Code Review
parent 33bfb66fe2 46b7d441c6
commit e1590884f2
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/widget/TextView.java
View File

@@ -4403,12 +4403,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
(mCurrentAlpha * Color.alpha(cursorcolor)) / 255);
}
mHighlightPaint.setStyle(Paint.Style.STROKE);
if (mCursorCount > 0) {
drawCursor = true;
} else {
highlight = mHighlightPath;
}
highlight = mHighlightPath;
drawCursor = true;
}
} else {
if (mHighlightPathBogus) {
@@ -4491,7 +4487,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
mCorrectionHighlighter.draw(canvas, cursorOffsetVertical);
}
if (drawCursor) drawCursor(canvas, cursorOffsetVertical);
if (drawCursor) {
drawCursor(canvas, cursorOffsetVertical);
// Rely on the drawable entirely, do not draw the cursor line.
// Has to be done after the IMM related code above which relies on the highlight.
highlight = null;
}
layout.draw(canvas, highlight, mHighlightPaint, cursorOffsetVertical);