commit 7f0f4f3c35fe0b6a94504ec39ac127fa935282ef
author Michael Jurka <mikejurka@google.com> Mon Aug 23 11:33:38 2010 -0700
committer Michael Jurka <mikejurka@google.com> Wed Aug 25 17:40:44 2010 -0700
tree 7b433b741098236d1b9efbca72f3eeb5b01ee2db
parent 241c3b451d7841ba08247beea784953eca4e8582

Workspace no longer scrolls during drag when shrunk

Change-Id: If71ba7638259f4015c5c088797f2b2719066cf2e

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 40108e7..b65a60c 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1731,22 +1731,26 @@
     }
 
     public void scrollLeft() {
-        if (mScroller.isFinished()) {
-            if (mCurrentScreen > 0)
-                snapToScreen(mCurrentScreen - 1);
-        } else {
-            if (mNextScreen > 0)
-                snapToScreen(mNextScreen - 1);
+        if (!mIsSmall) {
+            if (mScroller.isFinished()) {
+                if (mCurrentScreen > 0)
+                    snapToScreen(mCurrentScreen - 1);
+            } else {
+                if (mNextScreen > 0)
+                    snapToScreen(mNextScreen - 1);
+            }
         }
     }
 
     public void scrollRight() {
-        if (mScroller.isFinished()) {
-            if (mCurrentScreen < getChildCount() - 1)
-                snapToScreen(mCurrentScreen + 1);
-        } else {
-            if (mNextScreen < getChildCount() - 1)
-                snapToScreen(mNextScreen + 1);
+        if (!mIsSmall) {
+            if (mScroller.isFinished()) {
+                if (mCurrentScreen < getChildCount() - 1)
+                    snapToScreen(mCurrentScreen + 1);
+            } else {
+                if (mNextScreen < getChildCount() - 1)
+                    snapToScreen(mNextScreen + 1);
+            }
         }
     }