From f0cbf0f8b850db450b12ff35c523d5006ee72e5b Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Mon, 27 Mar 2017 11:29:19 -0700
Subject: [PATCH] Disable drag and drop on Folder when its animating.

Bug: 36644495
Bug: 35064148
Change-Id: Icd335a773359152fa2680e84f56c3e2eef3551e0
---
 src/com/android/launcher3/folder/Folder.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 8bbc99d6ec..945c8dc629 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -1085,6 +1085,9 @@ public class Folder extends AbstractFloatingView implements DragSource, View.OnC
     }
 
     public boolean isDropEnabled() {
+        if (FeatureFlags.LAUNCHER3_NEW_FOLDER_ANIMATION) {
+            return mState != STATE_ANIMATING;
+        }
         return true;
     }