summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Grace Kloba <klobag@google.com> 2010-02-02 11:59:38 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2010-02-02 11:59:38 -0800
commit0c08a2440f750bf0083436f73c35f1cf326068fe (patch)
tree2132dfead9dca98f0b52caa2a035514ba4080890
parent2d65817f17d0bfabac3849892c8a0f959b8dadc1 (diff)
parentf3be166946e946b2e4efe2945ac133ff9df920e4 (diff)
Merge "Now mSupportMultiTouch is depending on WebSettings, it can't be static any more."
-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 a6b74c41ca0b..f2dab6e03b08 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -464,7 +464,7 @@ public class WebView extends AbsoluteLayout
private int mHeldMotionless;
// whether support multi-touch
- private static boolean mSupportMultiTouch;
+ private boolean mSupportMultiTouch;
// use the framework's ScaleGestureDetector to handle multi-touch
private ScaleGestureDetector mScaleDetector;
// minimum scale change during multi-touch zoom