Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit 'e64e090e0d4f70233fac901ac1b977123f6f0452' into kraken

* commit 'e64e090e0d4f70233fac901ac1b977123f6f0452':
  Only include WEB_EDIT if there are more textfields.
This commit is contained in:
Leon Scroggins
2010-04-05 11:40:44 -07:00
committed by Android Git Automerger
parent d32de7f38f e64e090e0d
commit 86d663faa0
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/WebTextView.java
View File

@@ -818,8 +818,10 @@ import java.util.ArrayList;
boolean single = true; boolean single = true;
boolean inPassword = false; boolean inPassword = false;
int maxLength = -1; int maxLength = -1;
int inputType = EditorInfo.TYPE_CLASS_TEXT int inputType = EditorInfo.TYPE_CLASS_TEXT;
| EditorInfo.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT; if (mWebView.nativeFocusCandidateHasNextTextfield()) {
inputType |= EditorInfo.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT;
}
int imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI int imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
| EditorInfo.IME_FLAG_NO_FULLSCREEN; | EditorInfo.IME_FLAG_NO_FULLSCREEN;
switch (type) { switch (type) {

1
core/java/android/webkit/WebView.java
View File

@@ -7168,6 +7168,7 @@ public class WebView extends AbsoluteLayout
private native int nativeFindAll(String findLower, String findUpper); private native int nativeFindAll(String findLower, String findUpper);
private native void nativeFindNext(boolean forward); private native void nativeFindNext(boolean forward);
/* package */ native int nativeFocusCandidateFramePointer(); /* package */ native int nativeFocusCandidateFramePointer();
/* package */ native boolean nativeFocusCandidateHasNextTextfield();
private native boolean nativeFocusCandidateIsPassword(); private native boolean nativeFocusCandidateIsPassword();
private native boolean nativeFocusCandidateIsRtlText(); private native boolean nativeFocusCandidateIsRtlText();
private native boolean nativeFocusCandidateIsTextInput(); private native boolean nativeFocusCandidateIsTextInput();