diff options
| author | Leon Scroggins <scroggo@google.com> | 2011-01-28 10:36:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-28 10:36:34 -0800 |
| commit | ef6af6f79381675994bef8b1d1293cdc06933bbd (patch) | |
| tree | a1e4f693e3fba29db33f4db1e969b5a774f95cd0 /core/java/android | |
| parent | ecede3914f9532acaa89210f432812836ccc84d5 (diff) | |
| parent | f53e31551aeca325216e72e76d616f06c1fc14f9 (diff) | |
am f53e3155: am e891a115: Merge "Only send a direction key if we are not in touch mode." into honeycomb
* commit 'f53e31551aeca325216e72e76d616f06c1fc14f9':
Only send a direction key if we are not in touch mode.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 3ddeffdd70df..790a04023330 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -6835,7 +6835,7 @@ public class WebView extends AbsoluteLayout previouslyFocusedRect); } else { result = super.requestFocus(direction, previouslyFocusedRect); - if (mWebViewCore.getSettings().getNeedInitialFocus()) { + if (mWebViewCore.getSettings().getNeedInitialFocus() && !isInTouchMode()) { // For cases such as GMail, where we gain focus from a direction, // we want to move to the first available link. // FIXME: If there are no visible links, we may not want to |