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

Commit 3a81ac4a authored by Huahui Wu's avatar Huahui Wu Committed by Android (Google) Code Review
Browse files

Merge "b/5080166 Enalbe multi-touch on external touch escreen."

parents 868b387e 3e066c35

core/java/android/webkit/ZoomManager.java

+7 −3
Original line number Original line Diff line number Diff line
@@ -709,10 +709,14 @@ class ZoomManager { 




        final WebSettings settings = mWebView.getSettings();

        final WebSettings settings = mWebView.getSettings();

        final PackageManager pm = context.getPackageManager();

        final PackageManager pm = context.getPackageManager();

        mSupportMultiTouch = pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH)

        mSupportMultiTouch = 

                (pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH)

                 || pm.hasSystemFeature(PackageManager.FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT))

                && settings.supportZoom() && settings.getBuiltInZoomControls();

                && settings.supportZoom() && settings.getBuiltInZoomControls();

        mAllowPanAndScale = pm.hasSystemFeature(

        mAllowPanAndScale =

                PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT);

                pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT)

                || pm.hasSystemFeature(PackageManager.FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT);



        if (mSupportMultiTouch && (mScaleDetector == null)) {

        if (mSupportMultiTouch && (mScaleDetector == null)) {

            mScaleDetector = new ScaleGestureDetector(context, new ScaleDetectorListener());

            mScaleDetector = new ScaleGestureDetector(context, new ScaleDetectorListener());

        } else if (!mSupportMultiTouch && (mScaleDetector != null)) {

        } else if (!mSupportMultiTouch && (mScaleDetector != null)) {