commit 9d9dd60ee1faf1ebbe318034506fd9634f9e3fe9
author Hyunyoung Song <hyunyoungs@google.com> Fri May 01 19:08:39 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 01 19:08:40 2015 +0000
tree c8b4156c4c032736f9996b460ff1dba1830b1c47
parent 31abc291deb7a8879fc2ef675814efdb6fa9d56f
parent ffae07e447d64d29eace9bed321d837aba214e4a

Merge "WidgetTray UI - change text color for the section and widget name" into ub-launcher3-burnaby

src/com/android/launcher3/Folder.java

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index e0aecea..ed8eea7 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -704,9 +704,15 @@
         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 @@
             }
         }
         mSuppressFolderDeletion = false;
+        clearDragInfo();
     }
 
     @Thunk void replaceFolderWithFinalItem() {