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

Commit da3e835c authored by Leon Scroggins's avatar Leon Scroggins Committed by Android Git Automerger
Browse files

am 39837c5a: am 986a0380: am 69ec5c22: Remove the WebTextView if it is drawing when it shouldn\'t.

parents 9c7686b9 39837c5a

core/java/android/webkit/WebTextView.java

+17 −0
Original line number Diff line number Diff line
@@ -327,6 +327,23 @@ import java.util.ArrayList; 
        }

    }



    @Override

    protected void onDraw(Canvas canvas) {

        // onDraw should only be called for password fields.  If WebTextView is

        // still drawing, but is no longer corresponding to a password field,

        // remove it.

        if (mWebView == null || !mWebView.nativeFocusCandidateIsPassword()

                || !isSameTextField(mWebView.nativeFocusCandidatePointer())) {

            // Although calling remove() would seem to make more sense here,

            // changing it to not be a password field will make it not draw.

            // Other code will make sure that it is removed completely, but this

            // way the user will not see it.

            setInPassword(false);

        } else {

            super.onDraw(canvas);

        }

    }



    @Override

    public void onEditorAction(int actionCode) {

        switch (actionCode) {

core/java/android/webkit/WebView.java

+2 −2
Original line number Diff line number Diff line
@@ -7248,13 +7248,13 @@ public class WebView extends AbsoluteLayout 
    private native void     nativeFindNext(boolean forward);

    /* package */ native int      nativeFocusCandidateFramePointer();

    /* package */ native boolean  nativeFocusCandidateHasNextTextfield();

    private native boolean  nativeFocusCandidateIsPassword();

    /* package */ native boolean  nativeFocusCandidateIsPassword();

    private native boolean  nativeFocusCandidateIsRtlText();

    private native boolean  nativeFocusCandidateIsTextInput();

    /* package */ native int      nativeFocusCandidateMaxLength();

    /* package */ native String   nativeFocusCandidateName();

    private native Rect     nativeFocusCandidateNodeBounds();

    private native int      nativeFocusCandidatePointer();

    /* package */ native int      nativeFocusCandidatePointer();

    private native String   nativeFocusCandidateText();

    private native int      nativeFocusCandidateTextSize();

    /**