am 31abc291: Clearing drag state after the close animation is complete

* commit '31abc291deb7a8879fc2ef675814efdb6fa9d56f':
  Clearing drag state after the close animation is complete
This commit is contained in:
Sunny Goyal
2015-05-01 18:13:01 +00:00
committed by Android Git Automerger
+7
View File
@@ -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() {