Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 614f8450 authored by Grace Kloba's avatar Grace Kloba Committed by Bart Sears
Browse files

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
parent e88192b9

core/java/android/webkit/WebView.java

+1 −1
Original line number Diff line number Diff line
@@ -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