diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-10-01 00:05:19 -0700 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-10-01 00:05:19 -0700 |
| commit | 4e90e2adf167eaa7bfba5d609ed5524832f09f79 (patch) | |
| tree | 166a7e71912bb31e642400de669b44f7d4ac1543 /src/com/android/launcher3/Workspace.java | |
| parent | 21df17fb62e8499c43018eb239d9cfef85bac51a (diff) | |
| parent | c1277923cb0bbac372960dd5db0fc7516aa31c66 (diff) | |
| download | android_packages_apps_Trebuchet-4e90e2adf167eaa7bfba5d609ed5524832f09f79.tar.gz android_packages_apps_Trebuchet-4e90e2adf167eaa7bfba5d609ed5524832f09f79.tar.bz2 android_packages_apps_Trebuchet-4e90e2adf167eaa7bfba5d609ed5524832f09f79.zip | |
Merge branch 'cm-11.0' into stable/cm-11.0
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index c6c320df0..e935c99af 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -437,8 +437,6 @@ public class Workspace extends SmoothPagedView InstallShortcutReceiver.disableAndFlushInstallQueue(getContext()); UninstallShortcutReceiver.disableAndFlushUninstallQueue(getContext()); - removeExtraEmptyScreen(false, null); - mDragSourceInternal = null; mLauncher.onInteractionEnd(); } @@ -4336,6 +4334,11 @@ public class Workspace extends SmoothPagedView && mDragInfo.cell != null) { mDragInfo.cell.setVisibility(VISIBLE); } + + if (target instanceof InfoDropTarget) { + removeExtraEmptyScreen(false, null); + } + mDragOutline = null; mDragInfo = null; } |