Merge "Fixing drag and drop states" into ub-launcher3-master (d3b4dfa7) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/launcher3/uioverrides/AllAppsState.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -32,8 +32,7 @@ import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
		*/
		public class AllAppsState extends LauncherState {

		private static final int STATE_FLAGS = FLAG_DISABLE_ACCESSIBILITY
		\| FLAG_SHOW_SCRIM \| FLAG_ALL_APPS_SCRIM;
		private static final int STATE_FLAGS = FLAG_DISABLE_ACCESSIBILITY \| FLAG_ALL_APPS_SCRIM;

		private static final PageAlphaProvider PAGE_ALPHA_PROVIDER = new PageAlphaProvider(DEACCEL_2) {
		@Override

+9 −5

Original line number	Diff line number	Diff line
		@@ -583,6 +583,12 @@ public class DragController implements DragDriver.EventListener, TouchController
		}

		mDragObject.dragComplete = true;
		if (mIsInPreDrag) {
		if (dropTarget != null) {
		dropTarget.onDragExit(mDragObject);
		}
		return;
		}

		// Drop onto the target.
		boolean accepted = false;
		@@ -591,18 +597,16 @@ public class DragController implements DragDriver.EventListener, TouchController
		if (dropTarget.acceptDrop(mDragObject)) {
		if (flingAnimation != null) {
		flingAnimation.run();
		} else if (!mIsInPreDrag) {
		} else {
		dropTarget.onDrop(mDragObject, mOptions);
		}
		accepted = true;
		}
		}
		final View dropTargetAsView = dropTarget instanceof View ? (View) dropTarget : null;
		if (!mIsInPreDrag) {
		mLauncher.getUserEventDispatcher().logDragNDrop(mDragObject, dropTargetAsView);
		dispatchDropComplete(dropTargetAsView, accepted);
		}
		}

		private DropTarget findDropTarget(int x, int y, int[] dropCoordinates) {
		mDragObject.x = x;

+1 −2

Original line number	Diff line number	Diff line
		@@ -34,8 +34,7 @@ public class AllAppsState extends LauncherState {

		private static final float PARALLAX_COEFFICIENT = .125f;

		private static final int STATE_FLAGS = FLAG_DISABLE_ACCESSIBILITY
		\| FLAG_SHOW_SCRIM \| FLAG_ALL_APPS_SCRIM;
		private static final int STATE_FLAGS = FLAG_DISABLE_ACCESSIBILITY \| FLAG_ALL_APPS_SCRIM;

		private static final PageAlphaProvider PAGE_ALPHA_PROVIDER = new PageAlphaProvider(DEACCEL_2) {
		@Override