commit 038085598ca6180688767f90a759a5eda30e2daa
author Adam Cohen <adamcohen@google.com> Tue Feb 14 16:45:40 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 14 16:45:40 2012 -0800
tree 857bfd96d31144082314afb2794ad58293c51650
parent 78034235d14fef0a9524a4b2f254ea4b76e83b98
parent 82ac8a24883a3495a96189a6e5eb307f50177e0e

Merge "Fixing annoying bug where widget would drop to side page"

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 704138e..9274f81 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -2674,8 +2674,7 @@
 
     public void onDragOver(DragObject d) {
         // Skip drag over events while we are dragging over side pages
-        if (mInScrollArea) return;
-        if (mIsSwitchingState) return;
+        if (mInScrollArea || mIsSwitchingState || mState == State.SMALL) return;
 
         Rect r = new Rect();
         CellLayout layout = null;