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

Commit 808b04ab authored by Gilles Debunne's avatar Gilles Debunne Committed by Android (Google) Code Review
Browse files

Merge "Cursors correctly displayed with legacy theme."

parents 8f58dfad eca97a32

core/java/android/widget/TextView.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -4394,7 +4394,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
                        }

                        }

                        mHighlightPaint.setStyle(Paint.Style.STROKE);

                        mHighlightPaint.setStyle(Paint.Style.STROKE);

                        highlight = mHighlightPath;

                        highlight = mHighlightPath;

                        drawCursor = true;

                        drawCursor = mCursorCount > 0;

                    }

                    }

                } else {

                } else {

                    if (mHighlightPathBogus) {

                    if (mHighlightPathBogus) {
@@ -4503,7 +4503,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    }

    }





    private void updateCursorsPositions() {

    private void updateCursorsPositions() {

        if (mCursorDrawableRes == 0) return;

        if (mCursorDrawableRes == 0) {

            mCursorCount = 0;

            return; 

        }





        final int offset = getSelectionStart();

        final int offset = getSelectionStart();

        final int line = mLayout.getLineForOffset(offset);

        final int line = mLayout.getLineForOffset(offset);