Bug 708893 - Allow panning after releasing pinch zoom finger. r=pcwalton
authorKartikaya Gupta <kgupta@mozilla.com>
Thu, 15 Dec 2011 14:50:04 -0500
changeset 84333 5bd7bf20c046ce65bb20889801e8c02e63cdf83b
parent 84332 49bd0c9665e5e88a7804038506d68422732ab0fc
child 84334 46f82bd23a92bfaf9ee6dfb5885d06a89a55d5e3
push id519
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 00:38:35 +0000
treeherdermozilla-beta@788ea1ef610b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspcwalton
bugs708893
milestone11.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 708893 - Allow panning after releasing pinch zoom finger. r=pcwalton
mobile/android/base/ui/PanZoomController.java
--- a/mobile/android/base/ui/PanZoomController.java
+++ b/mobile/android/base/ui/PanZoomController.java
@@ -932,18 +932,20 @@ public class PanZoomController
         FloatSize pageSize = mController.getPageSize();
         RectF pageRect = new RectF(0,0, pageSize.width, pageSize.height);
 
         // Force a viewport synchronisation
         mController.setForceRedraw();
         mController.notifyLayerClientOfGeometryChange();
         GeckoApp.mAppContext.showPluginViews();
 
-        /* Bounce back if overscrolled. */
-        bounce();
+        mState = PanZoomState.TOUCHING;
+        mX.velocity = mY.velocity = 0.0f;
+        mX.locked = mY.locked = false;
+        mLastEventTime = detector.getEventTime();
     }
 
     @Override
     public void onLongPress(MotionEvent motionEvent) {
         JSONObject ret = new JSONObject();
         try {
             PointF point = new PointF(motionEvent.getX(), motionEvent.getY());
             point = mController.convertViewPointToLayerPoint(point);