summaryrefslogtreecommitdiff
path: root/core/java/android/webkit/WebView.java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-02-22 15:39:23 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-22 15:39:23 -0800
commit29cc47e62e1372f020c0488592c0bb1747f9a1f2 (patch)
tree46e08731a8e9667c1e218b8624cd36f0aa498802 /core/java/android/webkit/WebView.java
parent592b213608b67b6c9a72ed080db56fa9fb2cdcf8 (diff)
parent2b3d842a1c4bdbbc9ada932bbaac5561cede17ea (diff)
Merge "Fix drawing focus node rect in touch mode"
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 7efe2ff4efe0..71d162779e85 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -9249,7 +9249,7 @@ public class WebView extends AbsoluteLayout
if (mTouchHighlightRegion.isEmpty()) {
return false;
}
- if (mFocusedNode.mHasFocus) {
+ if (mFocusedNode.mHasFocus && !isInTouchMode()) {
return !mFocusedNode.mEditable;
}
if (mInitialHitTestResult.mType == HitTestResult.UNKNOWN_TYPE) {