summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit/WebTextView.java
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2010-01-06 17:04:38 -0500
committerLeon Scroggins <scroggo@google.com>2010-01-07 08:33:34 -0500
commit3a5033996e9df21abbd5b296d817c2acaedcb0f9 (patch)
tree7516a9f39369843b49adceccdeb705a2c861b81f /core/java/android/webkit/WebTextView.java
parente3bbaf6c4f51f8201922cae29daa7e46f6c43bda (diff)
downloadframeworks_base-3a5033996e9df21abbd5b296d817c2acaedcb0f9.zip
frameworks_base-3a5033996e9df21abbd5b296d817c2acaedcb0f9.tar.gz
frameworks_base-3a5033996e9df21abbd5b296d817c2acaedcb0f9.tar.bz2
Request <label> info only when accessing a textfield.
Previously, we were storing the label info each time we build the navigation cache. Requires a change to external/webkit.
Diffstat (limited to 'core/java/android/webkit/WebTextView.java')
-rw-r--r--core/java/android/webkit/WebTextView.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java
index cd2d26a..b6891b1 100644
--- a/core/java/android/webkit/WebTextView.java
+++ b/core/java/android/webkit/WebTextView.java
@@ -814,7 +814,6 @@ 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;
@@ -843,9 +842,11 @@ import java.util.ArrayList;
default:
break;
}
+ setHint(null);
if (single) {
+ mWebView.requestLabel(mWebView.nativeFocusCandidateFramePointer(),
+ mNodePointer);
maxLength = mWebView.nativeFocusCandidateMaxLength();
- setHint(mWebView.nativeFocusCandidateLabel());
if (type != 2 /* PASSWORD */) {
String name = mWebView.nativeFocusCandidateName();
if (name != null && name.length() > 0) {