summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit
diff options
context:
space:
mode:
authorCary Clark <cary@android.com>2009-10-21 13:55:48 -0400
committerCary Clark <cary@android.com>2009-10-21 13:55:48 -0400
commitfcafa46069a451d09f69a5df8c167596e7554666 (patch)
treec568db44ac6168820e33f12661c105c9ca3f3d86 /core/java/android/webkit
parent2a2805b7fbd25ee11ad554e33bf34dbb2e8b71c5 (diff)
downloadframeworks_base-fcafa46069a451d09f69a5df8c167596e7554666.zip
frameworks_base-fcafa46069a451d09f69a5df8c167596e7554666.tar.gz
frameworks_base-fcafa46069a451d09f69a5df8c167596e7554666.tar.bz2
fix multiple text areas, and text areas without focus rings
If the typed key doesn't go with the current text area, clear the focus so the key won't return to that text area. However, don't clear the focus if it is already off the old text area. fixes http://b/issue?id=2201049
Diffstat (limited to 'core/java/android/webkit')
-rw-r--r--core/java/android/webkit/WebTextView.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java
index e0d41c2..0e5e8b5 100644
--- a/core/java/android/webkit/WebTextView.java
+++ b/core/java/android/webkit/WebTextView.java
@@ -138,7 +138,10 @@ import java.util.ArrayList;
}
if (!isArrowKey && !mOkayForFocusNotToMatch
&& mWebView.nativeFocusNodePointer() != mNodePointer) {
- mWebView.nativeClearCursor();
+ if (mWebView.nativeCursorNodePointer() == mNodePointer) {
+ // remove cursor so character doesn't go back to this view
+ mWebView.nativeClearCursor();
+ }
// Do not call remove() here, which hides the soft keyboard. If
// the soft keyboard is being displayed, the user will still want
// it there.