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

Commit e0893a85 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Smooth out gesture zooming in WebViews."

parents fc8b7c9c 63814df6

core/java/android/webkit/ZoomManager.java

+3 −4
Original line number Diff line number Diff line
@@ -673,10 +673,9 @@ class ZoomManager { 


        public boolean onScale(ScaleGestureDetector detector) {

            // Prevent scaling beyond overview scale.

            float scale = Math.max(

                Math.round(detector.getScaleFactor() * mActualScale * 100) * 0.01f,

            float scale = Math.max(detector.getScaleFactor() * mActualScale,

                    getZoomOverviewScale());

            if (willScaleTriggerZoom(scale)) {

            if (mPinchToZoomAnimating || willScaleTriggerZoom(scale)) {

                mPinchToZoomAnimating = true;

                // limit the scale change per step

                if (scale > mActualScale) {