diff options
| author | Grace Kloba <klobag@google.com> | 2010-02-02 11:17:55 -0800 |
|---|---|---|
| committer | Bart Sears <bsears@google.com> | 2010-02-09 18:20:28 -0800 |
| commit | 614f8450a7f511e5ea279cfd870b1a8fa62ec5eb (patch) | |
| tree | d8c66be69133c613d259e4cb963fe6fefcddaf25 /core/java/android/webkit | |
| parent | e88192b9d2a8c364d8545471907c5baa275bb5f6 (diff) | |
| download | frameworks_base-614f8450a7f511e5ea279cfd870b1a8fa62ec5eb.zip frameworks_base-614f8450a7f511e5ea279cfd870b1a8fa62ec5eb.tar.gz frameworks_base-614f8450a7f511e5ea279cfd870b1a8fa62ec5eb.tar.bz2 | |
DO NOT MERGE
cherry-pick https://android-git.corp.google.com/g/#change,39258 from master
Now mSupportMultiTouch is depending on WebSettings,
it can't be static any more.
Fix http://b/issue?id=2413364
Diffstat (limited to 'core/java/android/webkit')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index ecee0d0..c5c14d3 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -434,7 +434,7 @@ public class WebView extends AbsoluteLayout private boolean mWrapContent; // 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 |