summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit/WebView.java
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2011-01-28 10:32:35 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-28 10:32:35 -0800
commite891a115a01d377dc17c0dd658ba23fb5d033e23 (patch)
treee6d3044bca6d2463551ed185cf020eea4ccb371a /core/java/android/webkit/WebView.java
parentfe38b7b79325782f682365ec9d1b8fe2932eec78 (diff)
parent572ba782021389b30c61ce31e8a193c1de1d16df (diff)
downloadframeworks_base-e891a115a01d377dc17c0dd658ba23fb5d033e23.zip
frameworks_base-e891a115a01d377dc17c0dd658ba23fb5d033e23.tar.gz
frameworks_base-e891a115a01d377dc17c0dd658ba23fb5d033e23.tar.bz2
Merge "Only send a direction key if we are not in touch mode." into honeycomb
Diffstat (limited to 'core/java/android/webkit/WebView.java')
-rw-r--r--core/java/android/webkit/WebView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 3ddeffd..790a040 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