diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-03-01 12:58:31 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-01 12:58:31 -0800 |
| commit | 3545c72ce1c8cb4948823936a384bab396e63e47 (patch) | |
| tree | 393a77a5ed56312d7d66441bb81ddf0ca134bcad /core | |
| parent | dfa28c3449a3fb9bf5c1875f1532e73e73e74440 (diff) | |
| parent | ac382cf581eb24937033ccd2a21d3d2f02f07767 (diff) | |
| download | frameworks_base-3545c72ce1c8cb4948823936a384bab396e63e47.zip frameworks_base-3545c72ce1c8cb4948823936a384bab396e63e47.tar.gz frameworks_base-3545c72ce1c8cb4948823936a384bab396e63e47.tar.bz2 | |
Merge "Don't update webkit at every stage of a zoom animation."
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() { |