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

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

Merge "Update insertion handler for WebTextView." into gingerbread

parents 42679cea 5642625c

core/java/android/webkit/WebTextView.java

+4 −0
Original line number Diff line number Diff line
@@ -334,6 +334,10 @@ import java.util.ArrayList; 
        }

    }



    public void onDrawSubstitute() {

      updateCursorControllerPositions();

    }



    @Override

    public void onEditorAction(int actionCode) {

        switch (actionCode) {

core/java/android/webkit/WebView.java

+3 −0
Original line number Diff line number Diff line
@@ -3531,6 +3531,9 @@ public class WebView extends AbsoluteLayout 
        if (AUTO_REDRAW_HACK && mAutoRedraw) {

            invalidate();

        }

        if (inEditingMode()) {

            mWebTextView.onDrawSubstitute();

        }

        mWebViewCore.signalRepaintDone();

    }

core/java/android/widget/TextView.java

+9 −0
Original line number Diff line number Diff line
@@ -4162,6 +4162,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();