diff options
| author | Leon Scroggins <scroggo@google.com> | 2010-01-06 13:45:46 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-06 13:45:46 -0800 |
| commit | fbd3afb1801ed69a5c948241e68b997be3d84f4e (patch) | |
| tree | a9373859d204f206b362ec31b9a950e882898246 | |
| parent | 552346a743be7c8b10893f817238e92938866999 (diff) | |
| parent | e38fc1898183a6bf8b0542a1d2627cdbcbd63198 (diff) | |
| download | frameworks_base-fbd3afb1801ed69a5c948241e68b997be3d84f4e.zip frameworks_base-fbd3afb1801ed69a5c948241e68b997be3d84f4e.tar.gz frameworks_base-fbd3afb1801ed69a5c948241e68b997be3d84f4e.tar.bz2 | |
am e38fc189: Show label information as hint text
Merge commit 'e38fc1898183a6bf8b0542a1d2627cdbcbd63198' into eclair-mr2-plus-aosp
* commit 'e38fc1898183a6bf8b0542a1d2627cdbcbd63198':
Show label information as hint text
| -rw-r--r-- | core/java/android/webkit/WebTextView.java | 2 | ||||
| -rw-r--r-- | core/java/android/webkit/WebView.java | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java index 9a36798..cd2d26a 100644 --- a/core/java/android/webkit/WebTextView.java +++ b/core/java/android/webkit/WebTextView.java @@ -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) { diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index f58446a..583195a 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -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(); |