diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-11-29 14:18:27 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-29 14:18:27 -0800 |
| commit | d3788b97c9a28e8cbfa4432389a5de04073a333b (patch) | |
| tree | 10a69ef66319307ef46b6cedf6c047ba0db73eab | |
| parent | a9a91ad356271c4c4d663223ff42694fbeb1d2a0 (diff) | |
| parent | 7ae9f3ab5517a3d58cc1f462d4a920cbe42a4213 (diff) | |
| download | frameworks_base-d3788b97c9a28e8cbfa4432389a5de04073a333b.zip frameworks_base-d3788b97c9a28e8cbfa4432389a5de04073a333b.tar.gz frameworks_base-d3788b97c9a28e8cbfa4432389a5de04073a333b.tar.bz2 | |
Merge "WebView animation support" into ics-mr1
| -rw-r--r-- | core/java/android/webkit/ZoomManager.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java index cf2c8a6..8c57265 100644 --- a/core/java/android/webkit/ZoomManager.java +++ b/core/java/android/webkit/ZoomManager.java @@ -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) { |