Don't switch pages when dragging out of folder

-> Fix bug where page switch indicator wouldn't draw on right
-> Fixed some code related to folder reordering -- no behaviour change
   yet, but once the new AutoScroll is in, this should behave correctly
   (ie. shouldn't reorder while in scroll zone)

Change-Id: Ic14a8d70858777164f094204472dc6a726dd461a

1 files changed, 2 insertions, 0 deletions

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index c70cbe0a5..3ff4fa323 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -691,6 +691,8 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
             } else {
                 mDragMode = DRAG_MODE_NONE;
             }
+        } else {
+            mReorderAlarm.cancelAlarm();
         }
     }