Merge "Drags originating in Folder exit spring loaded mode when completed." into ub-launcher3-master

This commit is contained in:
Tony Wickham authored and Android (Google) Code Review committed 2015-09-30 00:01:13 +00:00
commit a3b240d32b
2 files changed
+10 -2

No files matched your search

+5 -2
View File
@@ -3732,8 +3732,11 @@ public class Workspace extends PagedView
mDragOutline = null;
mDragInfo = null;
mLauncher.exitSpringLoadedDragModeDelayed(success,
Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, null);
if (!isFlingToDelete) {
// Fling to delete already exits spring loaded mode after the animation finishes.
mLauncher.exitSpringLoadedDragModeDelayed(success,
Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, null);
}
}
/**