diff options
author | Adam Powell <adamp@google.com> | 2012-09-04 19:49:13 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-04 19:49:13 -0700 |
commit | 4289b49dd580bd51b97b8e571b23aa00dbaec310 (patch) | |
tree | e8632d8212456ce53dac2fb441314d43086dfb59 /core/java/android/webkit/ZoomManager.java | |
parent | 52da9fa7b53690c073b15d849d0d9befe47314f7 (diff) | |
parent | 9f3b0bfd0b1d8876c96036a303b3ff72df0e8ad0 (diff) | |
download | frameworks_base-4289b49dd580bd51b97b8e571b23aa00dbaec310.zip frameworks_base-4289b49dd580bd51b97b8e571b23aa00dbaec310.tar.gz frameworks_base-4289b49dd580bd51b97b8e571b23aa00dbaec310.tar.bz2 |
am 9f3b0bfd: DO NOT MERGE - Make WebView track focal points more accurately
* commit '9f3b0bfd0b1d8876c96036a303b3ff72df0e8ad0':
DO NOT MERGE - Make WebView track focal points more accurately
Diffstat (limited to 'core/java/android/webkit/ZoomManager.java')
-rw-r--r-- | core/java/android/webkit/ZoomManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java index 8830119..80a6782 100644 --- a/core/java/android/webkit/ZoomManager.java +++ b/core/java/android/webkit/ZoomManager.java @@ -204,7 +204,7 @@ class ZoomManager { */ private boolean mAllowPanAndScale; - // use the framework's ScaleGestureDetector to handle multi-touch + // use the framework's ScaleGestureDetector to handle scaling gestures private ScaleGestureDetector mScaleDetector; private boolean mPinchToZoomAnimating = false; @@ -768,7 +768,7 @@ class ZoomManager { return isZoomAnimating(); } - public ScaleGestureDetector getMultiTouchGestureDetector() { + public ScaleGestureDetector getScaleGestureDetector() { return mScaleDetector; } |