aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 03:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tony Wickham
2015-09-30 00:01:13 +00:00
committed by Android (Google) Code Review
parent e872a420b6 2516428710
commit a3b240d32b
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/launcher3/Workspace.java
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);
}
}
/**