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

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

am e38fc189: Show label information as hint text 

Merge commit 'e38fc189' into eclair-mr2-plus-aosp

* commit 'e38fc189':
  Show label information as hint text
parents 552346a7 e38fc189

core/java/android/webkit/WebTextView.java

+2 −0
Original line number Diff line number Diff line
@@ -814,6 +814,7 @@ import java.util.ArrayList; 
                        | EditorInfo.TYPE_TEXT_FLAG_CAP_SENTENCES

                        | EditorInfo.TYPE_TEXT_FLAG_AUTO_CORRECT;

                setImeOptions(EditorInfo.IME_ACTION_NONE);

                setHint(null);

                break;

            case 2: // PASSWORD

                inPassword = true;
@@ -844,6 +845,7 @@ import java.util.ArrayList; 
        }

        if (single) {

            maxLength = mWebView.nativeFocusCandidateMaxLength();

            setHint(mWebView.nativeFocusCandidateLabel());

            if (type != 2 /* PASSWORD */) {

                String name = mWebView.nativeFocusCandidateName();

                if (name != null && name.length() > 0) {

core/java/android/webkit/WebView.java

+1 −0
Original line number Diff line number Diff line
@@ -6355,6 +6355,7 @@ public class WebView extends AbsoluteLayout 
    private native boolean  nativeFocusCandidateIsPlugin();

    private native boolean  nativeFocusCandidateIsRtlText();

    private native boolean  nativeFocusCandidateIsTextInput();

    /* package */ native String   nativeFocusCandidateLabel();

    /* package */ native int      nativeFocusCandidateMaxLength();

    /* package */ native String   nativeFocusCandidateName();

    private native Rect     nativeFocusCandidateNodeBounds();