diff options
| author | John Reck <jreck@google.com> | 2011-09-01 13:46:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-01 13:46:03 -0700 |
| commit | 0aadeca6cc05367faae1eacda6be580df41c17ee (patch) | |
| tree | c914b64f97764eb648eeee5373cec5b1df6be853 /core | |
| parent | 40f2faadc10f7b4b549dfd32c5bc1c7c2033ca48 (diff) | |
| parent | 39bb698cd255962fb69c99bc5179b9590b6efbb3 (diff) | |
| download | frameworks_base-0aadeca6cc05367faae1eacda6be580df41c17ee.zip frameworks_base-0aadeca6cc05367faae1eacda6be580df41c17ee.tar.gz frameworks_base-0aadeca6cc05367faae1eacda6be580df41c17ee.tar.bz2 | |
Merge "Partial rollback of I9ebc92dc"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 5200b12..673db8c 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -4007,12 +4007,9 @@ public class WebView extends AbsoluteLayout // state. // If mNativeClass is 0, we should not reach here, so we do not // need to check it again. - if (mDrawCursorRing && drawRings) { - // Only update if we are actually going to use the result - nativeRecordButtons(hasFocus() && hasWindowFocus(), - mTouchMode == TOUCH_SHORTPRESS_START_MODE - || mTrackballDown || mGotCenterDown, false); - } + nativeRecordButtons(hasFocus() && hasWindowFocus(), + (mTouchMode == TOUCH_SHORTPRESS_START_MODE && !USE_WEBKIT_RINGS) + || mTrackballDown || mGotCenterDown, false); drawCoreAndCursorRing(canvas, mBackgroundColor, mDrawCursorRing && drawRings); } |