commit 69c42da4d30f1cbba5fe1ac8960b4e305e14b807
author Adam Cohen <adamcohen@google.com> Thu Feb 03 16:38:07 2011 -0800
committer Adam Cohen <adamcohen@google.com> Thu Feb 03 16:42:47 2011 -0800
tree 2169271a5c66452231f39b5bf579f738e872bb29
parent f5d77c9e3fb9238b52f53b57eaa7ad01a1328e25

Preventing scrolling of workspace when in customize

Change-Id: I2154742957a4499df8c3df31c0a3ab65b58b54c7

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 42a746a..2b1a4d2 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -568,33 +568,35 @@
 
     @Override
     protected void determineScrollingStart(MotionEvent ev) {
-        float deltaX = Math.abs(ev.getX() - mXDown);
-        float deltaY = Math.abs(ev.getY() - mYDown);
+        if (!mIsSmall && !mIsInUnshrinkAnimation) {
+            float deltaX = Math.abs(ev.getX() - mXDown);
+            float deltaY = Math.abs(ev.getY() - mYDown);
 
-        if (Float.compare(deltaX, 0f) == 0) return;
+            if (Float.compare(deltaX, 0f) == 0) return;
 
-        float slope = deltaY / deltaX;
-        float theta = (float) Math.atan(slope);
+            float slope = deltaY / deltaX;
+            float theta = (float) Math.atan(slope);
 
-        if (deltaX > mTouchSlop || deltaY > mTouchSlop) {
-            cancelCurrentPageLongPress();
-        }
+            if (deltaX > mTouchSlop || deltaY > mTouchSlop) {
+                cancelCurrentPageLongPress();
+            }
 
-        if (theta > MAX_SWIPE_ANGLE) {
-            // Above MAX_SWIPE_ANGLE, we don't want to ever start scrolling the workspace
-            return;
-        } else if (theta > START_DAMPING_TOUCH_SLOP_ANGLE) {
-            // Above START_DAMPING_TOUCH_SLOP_ANGLE and below MAX_SWIPE_ANGLE, we want to increase
-            // the touch slop to make it harder to begin scrolling the workspace. This results
-            // in vertically scrolling widgets to more easily. The higher the angle, the
-            // more we increase touch slop.
-            theta -= START_DAMPING_TOUCH_SLOP_ANGLE;
-            float extraRatio = (float)
-                    Math.sqrt((theta / (MAX_SWIPE_ANGLE - START_DAMPING_TOUCH_SLOP_ANGLE)));
-            super.determineScrollingStart(ev, 1 + TOUCH_SLOP_DAMPING_FACTOR * extraRatio);
-        } else {
-            // Below START_DAMPING_TOUCH_SLOP_ANGLE, we don't do anything special
-            super.determineScrollingStart(ev);
+            if (theta > MAX_SWIPE_ANGLE) {
+                // Above MAX_SWIPE_ANGLE, we don't want to ever start scrolling the workspace
+                return;
+            } else if (theta > START_DAMPING_TOUCH_SLOP_ANGLE) {
+                // Above START_DAMPING_TOUCH_SLOP_ANGLE and below MAX_SWIPE_ANGLE, we want to
+                // increase the touch slop to make it harder to begin scrolling the workspace. This 
+                // results in vertically scrolling widgets to more easily. The higher the angle, the
+                // more we increase touch slop.
+                theta -= START_DAMPING_TOUCH_SLOP_ANGLE;
+                float extraRatio = (float)
+                        Math.sqrt((theta / (MAX_SWIPE_ANGLE - START_DAMPING_TOUCH_SLOP_ANGLE)));
+                super.determineScrollingStart(ev, 1 + TOUCH_SLOP_DAMPING_FACTOR * extraRatio);
+            } else {
+                // Below START_DAMPING_TOUCH_SLOP_ANGLE, we don't do anything special
+                super.determineScrollingStart(ev);
+            }
         }
     }