commit 55bd9725d5c0373b89f7b9bbd9547550ea3bbc63
author Jorim Jaggi <jjaggi@google.com> Thu Jan 16 15:30:42 2014 -0800
committer Jorim Jaggi <jjaggi@google.com> Wed Feb 12 22:16:51 2014 +0100
tree d42a4d3a6fc5e53fbe36d0a8d705e92ed7d4988d
parent f180497bc303af666d2672fc268730f4ec1c771b

Implement spring-loading of folders when dragging over.

Bug: 8912132
Change-Id: Id81889a133e56461df2e20599c4b40020818ba18

src/com/android/launcher3/AppsCustomizePagedView.java

diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java
index 49b12b1..251ae21 100644
--- a/src/com/android/launcher3/AppsCustomizePagedView.java
+++ b/src/com/android/launcher3/AppsCustomizePagedView.java
@@ -817,7 +817,7 @@
      */
     private void endDragging(View target, boolean isFlingToDelete, boolean success) {
         if (isFlingToDelete || !success || (target != mLauncher.getWorkspace() &&
-                !(target instanceof DeleteDropTarget))) {
+                !(target instanceof DeleteDropTarget) && !(target instanceof Folder))) {
             // Exit spring loaded mode if we have not successfully dropped or have not handled the
             // drop in Workspace
             mLauncher.getWorkspace().removeExtraEmptyScreen(true, new Runnable() {