commit 9cbe86deeee33358e0c019f2e7dcd2c8c461075c
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Mar 27 19:24:22 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 27 19:24:23 2017 +0000
tree 1f519cae78c4e6e168eeeb2a70d356f5fc2a8965
parent 467de1bdb11c59be8c7a0906e6e342138e955f2c
parent f0cbf0f8b850db450b12ff35c523d5006ee72e5b

Merge "Disable drag and drop on Folder when its animating." into ub-launcher3-master

src/com/android/launcher3/folder/Folder.java

diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 8bbc99d..945c8dc 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -1085,6 +1085,9 @@
     }
 
     public boolean isDropEnabled() {
+        if (FeatureFlags.LAUNCHER3_NEW_FOLDER_ANIMATION) {
+            return mState != STATE_ANIMATING;
+        }
         return true;
     }