commit 1adf5391a3a3d215b226adf3702019c22a99e3b1
author Michael Jurka <mikejurka@google.com> Mon Oct 18 18:10:22 2010 -0700
committer Michael Jurka <mikejurka@google.com> Mon Oct 18 18:16:46 2010 -0700
tree d624f0002317ad02a6b53bb828fd3fe73b91965f
parent ec031f50810fd16cb6243fbbbabd9ac76820c72b

Fixing a bug where you could scroll the mini screens

Change-Id: I3638618cb5f4ec2705955fda994fd6aff42fd70f

src/com/android/launcher2/PagedView.java

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 11261a5..abb9b0b 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -715,7 +715,7 @@
      * Determines if we should change the touch state to start scrolling after the
      * user moves their touch point too far.
      */
-    private void determineScrollingStart(MotionEvent ev) {
+    protected void determineScrollingStart(MotionEvent ev) {
         /*
          * Locally do absolute value. mLastMotionX is set to the y value
          * of the down event.

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 051ac65..8f5a115 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -416,6 +416,11 @@
         return super.onInterceptTouchEvent(ev);
     }
 
+    @Override
+    protected void determineScrollingStart(MotionEvent ev) {
+        if (!mIsSmall && !mIsInUnshrinkAnimation) super.determineScrollingStart(ev);
+    }
+
     protected void onPageBeginMoving() {
         if (mNextPage != INVALID_PAGE) {
             // we're snapping to a particular screen