| commit | f0cbf0f8b850db450b12ff35c523d5006ee72e5b | [log] [tgz] |
|---|---|---|
| author | Jon Miranda <jonmiranda@google.com> | Mon Mar 27 11:29:19 2017 -0700 |
| committer | Jon Miranda <jonmiranda@google.com> | Mon Mar 27 11:29:19 2017 -0700 |
| tree | 5a8d761a758fe19372ff186ab3c503ffa8d319cd | |
| parent | 5756900508177f6be1c1e9c1111d785a1e575a4d [diff] |
Disable drag and drop on Folder when its animating. Bug: 36644495 Bug: 35064148 Change-Id: Icd335a773359152fa2680e84f56c3e2eef3551e0
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; }