diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-05-01 10:42:32 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-05-01 10:43:25 -0700 |
| commit | 31abc291deb7a8879fc2ef675814efdb6fa9d56f (patch) | |
| tree | 90aa9ec6c3d2e257169a965f7afff6c818be9dae /src/com/android/launcher3/Folder.java | |
| parent | 111c83579a165fe9d8f915cda4e08de47e16c056 (diff) | |
| download | android_packages_apps_Trebuchet-31abc291deb7a8879fc2ef675814efdb6fa9d56f.tar.gz android_packages_apps_Trebuchet-31abc291deb7a8879fc2ef675814efdb6fa9d56f.tar.bz2 android_packages_apps_Trebuchet-31abc291deb7a8879fc2ef675814efdb6fa9d56f.zip | |
Clearing drag state after the close animation is complete
Bug: 19350802
Change-Id: I048dfa2743692c6c7d56dcacab900ec2d17504ed
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
| -rw-r--r-- | src/com/android/launcher3/Folder.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index e0aeceae8..ed8eea73f 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -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() { |