diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-10-05 22:12:03 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-05 22:12:03 +0000 |
commit | 878b5efaa312393d81e626b03dc2ae3286d47611 (patch) | |
tree | 269dd65985183abbc8f6f5682ab07a7bcbeecd8a /src/com/android/launcher3/folder/Folder.java | |
parent | 661e5583215937e1e632c6a5b5a685ffb78ce6ee (diff) | |
parent | 6d3586c761baafc28aeff755c16c2f5968229f22 (diff) | |
download | android_packages_apps_Trebuchet-878b5efaa312393d81e626b03dc2ae3286d47611.tar.gz android_packages_apps_Trebuchet-878b5efaa312393d81e626b03dc2ae3286d47611.tar.bz2 android_packages_apps_Trebuchet-878b5efaa312393d81e626b03dc2ae3286d47611.zip |
Merge "Polish animation when icon returns to Folder." into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/folder/Folder.java')
-rw-r--r-- | src/com/android/launcher3/folder/Folder.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index e182da140..0932b7411 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -886,7 +886,7 @@ public class Folder extends AbstractFloatingView implements DragSource, View.OnC mItemsInvalidated = true; try (SuppressInfoChanges s = new SuppressInfoChanges()) { - mFolderIcon.onDrop(d); + mFolderIcon.onDrop(d, true /* itemReturnedOnFailedDrop */); } } |