Merge "Mark cells as unoccupied in onDragStart instead of startDrag." into ub-launcher3-master (1da14394) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/CellLayout.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -2215,10 +2215,6 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler {
		return solution;
		}

		public void prepareChildForDrag(View child) {
		markCellsAsUnoccupiedForView(child);
		}

		/* This seems like it should be obvious and straight-forward, but when the direction vector
		needs to match with the notion of the dragView pushing other views, we have to employ
		a slightly more subtle notion of the direction vector. The question is what two points is

+7 −4

Original line number	Diff line number	Diff line
		@@ -411,6 +411,11 @@ public class Workspace extends PagedView
		enforceDragParity("onDragStart", 0, 0);
		}

		if (mDragInfo != null && mDragInfo.cell != null) {
		CellLayout layout = (CellLayout) mDragInfo.cell.getParent().getParent();
		layout.markCellsAsUnoccupiedForView(mDragInfo.cell);
		}

		if (mOutlineProvider != null) {
		// The outline is used to visualize where the item will land if dropped
		mOutlineProvider.generateDragOutline(mCanvas);
		@@ -478,6 +483,8 @@ public class Workspace extends PagedView
		// Re-enable any Un/InstallShortcutReceiver and now process any queued items
		InstallShortcutReceiver.disableAndFlushInstallQueue(getContext());

		mOutlineProvider = null;
		mDragInfo = null;
		mDragSourceInternal = null;
		mLauncher.onInteractionEnd();
		}
		@@ -2245,8 +2252,6 @@ public class Workspace extends PagedView

		mDragInfo = cellInfo;
		child.setVisibility(INVISIBLE);
		CellLayout layout = (CellLayout) child.getParent().getParent();
		layout.prepareChildForDrag(child);

		if (options.isAccessibleDrag) {
		mDragController.addDragListener(new AccessibleDragListenerAdapter(
		@@ -3680,8 +3685,6 @@ public class Workspace extends PagedView
		&& mDragInfo.cell != null) {
		mDragInfo.cell.setVisibility(VISIBLE);
		}
		mOutlineProvider = null;
		mDragInfo = null;

		if (!isFlingToDelete) {
		// Fling to delete already exits spring loaded mode after the animation finishes.