diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-01-16 15:30:42 -0800 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2014-02-12 22:16:51 +0100 |
| commit | 55bd9725d5c0373b89f7b9bbd9547550ea3bbc63 (patch) | |
| tree | d42a4d3a6fc5e53fbe36d0a8d705e92ed7d4988d /src/com/android/launcher3/AppsCustomizePagedView.java | |
| parent | f180497bc303af666d2672fc268730f4ec1c771b (diff) | |
| download | android_packages_apps_Trebuchet-55bd9725d5c0373b89f7b9bbd9547550ea3bbc63.tar.gz android_packages_apps_Trebuchet-55bd9725d5c0373b89f7b9bbd9547550ea3bbc63.tar.bz2 android_packages_apps_Trebuchet-55bd9725d5c0373b89f7b9bbd9547550ea3bbc63.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.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java index 49b12b1b1..251ae2108 100644 --- a/src/com/android/launcher3/AppsCustomizePagedView.java +++ b/src/com/android/launcher3/AppsCustomizePagedView.java @@ -817,7 +817,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() { |