summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2010-01-05 10:59:40 -0500
committerLeon Scroggins <scroggo@google.com>2010-01-06 10:15:00 -0500
commite38fc1898183a6bf8b0542a1d2627cdbcbd63198 (patch)
tree0a7672047fea0a039dc5c44fee49181f8f772642
parent106f9b244633171ab75dd98b9761b7137c1a4705 (diff)
downloadframeworks_base-e38fc1898183a6bf8b0542a1d2627cdbcbd63198.zip
frameworks_base-e38fc1898183a6bf8b0542a1d2627cdbcbd63198.tar.gz
frameworks_base-e38fc1898183a6bf8b0542a1d2627cdbcbd63198.tar.bz2
Show label information as hint text
Fix for http://b/issue?id=2331526 Requires a change to external/webkit.
-rw-r--r--core/java/android/webkit/WebTextView.java2
-rw-r--r--core/java/android/webkit/WebView.java1
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();