Clearing drag state after the close animation is complete

Bug: 19350802 Change-Id: I048dfa2743692c6c7d56dcacab900ec2d17504ed
2015-05-01 10:42:32 -07:00
parent 111c83579a
commit 31abc291de
1 changed files with 7 additions and 0 deletions
@@ -704,9 +704,15 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
        if (mInfo.opened) {
            mLauncher.closeFolder();
            mRearrangeOnClose = true;
+        } else if (mState == STATE_ANIMATING) {
+            mRearrangeOnClose = true;
        } else {
            rearrangeChildren();
+            clearDragInfo();
        }
+    }
+
+    private void clearDragInfo() {
        mCurrentDragInfo = null;
        mCurrentDragView = null;
        mSuppressOnAdd = false;
@@ -1037,6 +1043,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
            }
        }
        mSuppressFolderDeletion = false;
+        clearDragInfo();
    }

    @Thunk void replaceFolderWithFinalItem() {