summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/AppsCustomizePagedView.java
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2014-01-16 15:30:42 -0800
committerDanesh M <daneshm90@gmail.com>2014-06-06 22:54:28 -0700
commit0f89422e2821c407ea9feacbe078236391df581f (patch)
tree71fd6d17d6ad30431ca0abffdb2cafc4830077e0 /src/com/android/launcher3/AppsCustomizePagedView.java
parentae89bc568bf51719fbb41087352b45344a1ad5fa (diff)
downloadandroid_packages_apps_Trebuchet-0f89422e2821c407ea9feacbe078236391df581f.tar.gz
android_packages_apps_Trebuchet-0f89422e2821c407ea9feacbe078236391df581f.tar.bz2
android_packages_apps_Trebuchet-0f89422e2821c407ea9feacbe078236391df581f.zip
Implement spring-loading of folders when dragging over.
Bug: 8912132 Change-Id: Id81889a133e56461df2e20599c4b40020818ba18
Diffstat (limited to 'src/com/android/launcher3/AppsCustomizePagedView.java')
-rw-r--r--src/com/android/launcher3/AppsCustomizePagedView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java
index 702d94c87..136ac6574 100644
--- a/src/com/android/launcher3/AppsCustomizePagedView.java
+++ b/src/com/android/launcher3/AppsCustomizePagedView.java
@@ -897,7 +897,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
*/
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() {