diff options
| author | Leon Scroggins <scroggo@google.com> | 2011-01-26 10:06:42 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-26 10:06:42 -0800 |
| commit | 8b2d4825e1d7ca22aab9ae9fdfa1ecd34f154e22 (patch) | |
| tree | 1c1e5d0ec7d7dfa9d9cebb05c80a2474ca40fdd1 /core/java/android/webkit/WebView.java | |
| parent | 66a9f48bbf9c2dfc25c1e520fcc05e3d5c2abe84 (diff) | |
| parent | cef1c59efca2323122c3b69b75862aecd03b56c1 (diff) | |
| download | frameworks_base-8b2d4825e1d7ca22aab9ae9fdfa1ecd34f154e22.zip frameworks_base-8b2d4825e1d7ca22aab9ae9fdfa1ecd34f154e22.tar.gz frameworks_base-8b2d4825e1d7ca22aab9ae9fdfa1ecd34f154e22.tar.bz2 | |
Merge "Move last touch point when moving the cursor node." into honeycomb
Diffstat (limited to 'core/java/android/webkit/WebView.java')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index cf1ce6b..1d5d08f 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -8075,7 +8075,7 @@ public class WebView extends AbsoluteLayout + " mLastCursorTime=" + mLastCursorTime + " handled=" + keyHandled); } - if (keyHandled == false || mHeightCanMeasure == false) { + if (keyHandled == false) { return keyHandled; } Rect contentCursorRingBounds = nativeGetCursorRingBounds(); @@ -8084,6 +8084,9 @@ public class WebView extends AbsoluteLayout // set last touch so that context menu related functions will work mLastTouchX = (viewCursorRingBounds.left + viewCursorRingBounds.right) / 2; mLastTouchY = (viewCursorRingBounds.top + viewCursorRingBounds.bottom) / 2; + if (mHeightCanMeasure == false) { + return keyHandled; + } Rect visRect = new Rect(); calcOurVisibleRect(visRect); Rect outset = new Rect(visRect); |