From 7f0f4f3c35fe0b6a94504ec39ac127fa935282ef Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Mon, 23 Aug 2010 11:33:38 -0700
Subject: [PATCH] Workspace no longer scrolls during drag when shrunk

Change-Id: If71ba7638259f4015c5c088797f2b2719066cf2e
---
 src/com/android/launcher2/Workspace.java | 28 ++++++++++++++----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 40108e77cf..b65a60c0ad 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1731,22 +1731,26 @@ public class Workspace extends ViewGroup
     }
 
     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);
+            }
         }
     }