diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-21 14:14:46 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-21 14:14:46 -0400 |
| commit | 7a7197853de1b8aea0945b5b72e0eb12b2837b50 (patch) | |
| tree | 60111a4f98794013ccf7ab5f43c291e823245d10 /core/java/android/webkit | |
| parent | a8da17356f9a385e097e3eef205358462d214538 (diff) | |
| parent | fcafa46069a451d09f69a5df8c167596e7554666 (diff) | |
| download | frameworks_base-7a7197853de1b8aea0945b5b72e0eb12b2837b50.zip frameworks_base-7a7197853de1b8aea0945b5b72e0eb12b2837b50.tar.gz frameworks_base-7a7197853de1b8aea0945b5b72e0eb12b2837b50.tar.bz2 | |
Merge change Ifcafa460 into eclair-mr2
* changes:
fix multiple text areas, and text areas without focus rings
Diffstat (limited to 'core/java/android/webkit')
| -rw-r--r-- | core/java/android/webkit/WebTextView.java | 5 |
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. |