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

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

am f9b1a092: Only include WEB_EDIT if there are more textfields. 

Merge commit 'f9b1a092' into froyo-plus-aosp

* commit 'f9b1a092':
  Only include WEB_EDIT if there are more textfields.
parents 9d782f62 f9b1a092

core/java/android/webkit/WebTextView.java

+4 −2
Original line number Diff line number Diff line
@@ -818,8 +818,10 @@ import java.util.ArrayList; 
        boolean single = true;

        boolean inPassword = false;

        int maxLength = -1;

        int inputType = EditorInfo.TYPE_CLASS_TEXT

                | EditorInfo.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT;

        int inputType = EditorInfo.TYPE_CLASS_TEXT;

        if (mWebView.nativeFocusCandidateHasNextTextfield()) {

            inputType |= EditorInfo.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT;

        }

        int imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI

                | EditorInfo.IME_FLAG_NO_FULLSCREEN;

        switch (type) {

core/java/android/webkit/WebView.java

+1 −0
Original line number Diff line number Diff line
@@ -7168,6 +7168,7 @@ public class WebView extends AbsoluteLayout 
    private native int      nativeFindAll(String findLower, String findUpper);

    private native void     nativeFindNext(boolean forward);

    /* package */ native int      nativeFocusCandidateFramePointer();

    /* package */ native boolean  nativeFocusCandidateHasNextTextfield();

    private native boolean  nativeFocusCandidateIsPassword();

    private native boolean  nativeFocusCandidateIsRtlText();

    private native boolean  nativeFocusCandidateIsTextInput();