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

Commit 03476ddb authored by Leon Scroggins's avatar Leon Scroggins Committed by Android (Google) Code Review
Browse files

Merge "Merge commit '55381217' into manualmerge"

parents fe176252 c826a693

core/java/android/webkit/WebTextView.java

+1 −0
Original line number Diff line number Diff line
@@ -370,6 +370,7 @@ import java.util.ArrayList; 
            int candEnd = EditableInputConnection.getComposingSpanEnd(sp);

            imm.updateSelection(this, selStart, selEnd, candStart, candEnd);

        }

        updateCursorControllerPositions();

    }



    @Override

core/java/android/webkit/WebView.java

+3 −1
Original line number Diff line number Diff line
@@ -3477,7 +3477,9 @@ public class WebView extends AbsoluteLayout 
        if (AUTO_REDRAW_HACK && mAutoRedraw) {

            invalidate();

        }

        if (inEditingMode()) mWebTextView.onDrawSubstitute();

        if (inEditingMode()) {

            mWebTextView.onDrawSubstitute();

        }

        mWebViewCore.signalRepaintDone();



        // paint the highlight in the end

core/java/android/widget/TextView.java

+9 −0
Original line number Diff line number Diff line
@@ -4277,6 +4277,15 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 


        canvas.restore();



        updateCursorControllerPositions();

    }



    /**

     * Update the positions of the CursorControllers.  Needed by WebTextView,

     * which does not draw.

     * @hide

     */

    protected void updateCursorControllerPositions() {

        if (mInsertionPointCursorController != null &&

                mInsertionPointCursorController.isShowing()) {

            mInsertionPointCursorController.updatePosition();