diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-03-01 15:50:27 -0500 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2011-03-01 15:50:27 -0500 |
| commit | ac382cf581eb24937033ccd2a21d3d2f02f07767 (patch) | |
| tree | dd1441467a332e3ca628a7a15f942397a21162f3 /core | |
| parent | 43cdf9b4191e18b5a4d646d23b06438c0e10b8dd (diff) | |
| download | frameworks_base-ac382cf581eb24937033ccd2a21d3d2f02f07767.zip frameworks_base-ac382cf581eb24937033ccd2a21d3d2f02f07767.tar.gz frameworks_base-ac382cf581eb24937033ccd2a21d3d2f02f07767.tar.bz2 | |
Don't update webkit at every stage of a zoom animation.
This CL defers updating webkit until a zoom animation has completed.
bug: 3451126
Change-Id: I75a90f307a3493363811ba67ec4e55bfec9c0702
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/ZoomManager.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java index 6303850..ee0d122 100644 --- a/core/java/android/webkit/ZoomManager.java +++ b/core/java/android/webkit/ZoomManager.java @@ -704,9 +704,10 @@ class ZoomManager { * false otherwise. */ public boolean isPreventingWebkitUpdates() { - // currently only animating a multi-touch zoom prevents updates, but - // others can add their own conditions to this method if necessary. - return mPinchToZoomAnimating; + // currently only animating a multi-touch zoom and fixed length + // animations prevent updates, but others can add their own conditions + // to this method if necessary. + return isZoomAnimating(); } public ScaleGestureDetector getMultiTouchGestureDetector() { |