Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3871e726 authored by Jonathan Miranda's avatar Jonathan Miranda Committed by Android (Google) Code Review
Browse files

Merge "Fix bug where add to folder fails even when folder creation animation... 

Merge "Fix bug where add to folder fails even when folder creation animation runs." into ub-launcher3-edmonton-polish
parents 8d71d490 36f6359c

src/com/android/launcher3/Workspace.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -2387,7 +2387,12 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 




    private void manageFolderFeedback(CellLayout targetLayout,

    private void manageFolderFeedback(CellLayout targetLayout,

            int[] targetCell, float distance, DragObject dragObject) {

            int[] targetCell, float distance, DragObject dragObject) {

        if (distance > mMaxDistanceForFolderCreation) return;

        if (distance > mMaxDistanceForFolderCreation) {

            if (mDragMode != DRAG_MODE_NONE) {

                setDragMode(DRAG_MODE_NONE);

            }

            return;

        }





        final View dragOverView = mDragTargetLayout.getChildAt(mTargetCell[0], mTargetCell[1]);

        final View dragOverView = mDragTargetLayout.getChildAt(mTargetCell[0], mTargetCell[1]);

        ItemInfo info = dragObject.dragInfo;

        ItemInfo info = dragObject.dragInfo;