From 614f8450a7f511e5ea279cfd870b1a8fa62ec5eb Mon Sep 17 00:00:00 2001 From: Grace Kloba Date: Tue, 2 Feb 2010 11:17:55 -0800 Subject: [PATCH] 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 --- core/java/android/webkit/WebView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index ecee0d0f4c342..c5c14d3ee08ac 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