Merge "Cursors correctly displayed with legacy theme."

2011-02-24 10:29:44 -08:00
parent 8f58dfad89 eca97a320f
commit 808b04abe6
1 changed files with 5 additions and 2 deletions
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -4394,7 +4394,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                        }
                        mHighlightPaint.setStyle(Paint.Style.STROKE);
                        highlight = mHighlightPath;
-                        drawCursor = true;
+                        drawCursor = mCursorCount > 0;
                    }
                } else {
                    if (mHighlightPathBogus) {
@@ -4503,7 +4503,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
    }

    private void updateCursorsPositions() {
-        if (mCursorDrawableRes == 0) return;
+        if (mCursorDrawableRes == 0) {
+            mCursorCount = 0;
+            return; 
+        }

        final int offset = getSelectionStart();
        final int line = mLayout.getLineForOffset(offset);