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

Commit 0e9f0c3e authored by Teng-Hui Zhu's avatar Teng-Hui Zhu Committed by Android Git Automerger
Browse files

am e9dc400c: am d3788b97: Merge "WebView animation support" into ics-mr1 

* commit 'e9dc400c':
  WebView animation support
parents 9e81c791 e9dc400c

core/java/android/webkit/ZoomManager.java

+3 −0
Original line number Diff line number Diff line
@@ -493,6 +493,9 @@ class ZoomManager { 


        if (mHardwareAccelerated) {

            mWebView.updateScrollCoordinates(mWebView.getScrollX() - tx, mWebView.getScrollY() - ty);

            // By adding webView matrix, we need to offset the canvas a bit

            // to make the animation smooth.

            canvas.translate(tx, ty);

            setZoomScale(zoomScale, false);



            if (mZoomScale == 0) {