Cleaning up drag state management.
When the drag is started, the UI automatically goes into spring loaded mode. On a successful
drop, it is the responsibility of the {@link DropTarget} to exit out of the spring loaded
mode. If the drop was cancelled for some reason, the UI will automatically exit out of this mode.
Bug: 34692289
Change-Id: Ic611739a43bb8d9279b587aaee3039326c143e8b
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index ffc2b02..e1b5e2c 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -229,7 +229,7 @@
public void run() {
completeDrop(d);
mDropTargetBar.onDragEnd();
- mLauncher.exitSpringLoadedDragModeDelayed(true, 0, null);
+ mLauncher.exitSpringLoadedDragMode(true, 0);
}
};
dragLayer.animateView(d.dragView, from, to, scale, 1f, 1f, 0.1f, 0.1f,
diff --git a/src/com/android/launcher3/DragSource.java b/src/com/android/launcher3/DragSource.java
index c6106c2..93f865c 100644
--- a/src/com/android/launcher3/DragSource.java
+++ b/src/com/android/launcher3/DragSource.java
@@ -30,5 +30,5 @@
* A callback made back to the source after an item from this source has been dropped on a
* DropTarget.
*/
- void onDropCompleted(View target, DragObject d, boolean isFlingToDelete, boolean success);
+ void onDropCompleted(View target, DragObject d, boolean success);
}
diff --git a/src/com/android/launcher3/DropTarget.java b/src/com/android/launcher3/DropTarget.java
index 2307b89..4d30479 100644
--- a/src/com/android/launcher3/DropTarget.java
+++ b/src/com/android/launcher3/DropTarget.java
@@ -59,9 +59,6 @@
/** The object is part of an accessible drag operation */
public boolean accessibleDrag;
- /** Post drag animation runnable */
- public Runnable postAnimationRunnable = null;
-
/** Indicates that the drag operation was cancelled */
public boolean cancelled = false;
@@ -105,7 +102,14 @@
boolean isDropEnabled();
/**
- * Handle an object being dropped on the DropTarget
+ * Handle an object being dropped on the DropTarget.
+ *
+ * This will be called only if this target previously returned true for {@link #acceptDrop}. It
+ * is the responsibility of this target to exit out of the spring loaded mode (either
+ * immediately or after any pending animations).
+ *
+ * If the drop was cancelled for some reason, onDrop will never get called, the UI will
+ * automatically exit out of this mode.
*/
void onDrop(DragObject dragObject, DragOptions options);
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5c635ca..bfcd82a 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -582,8 +582,8 @@
Runnable exitSpringLoaded = new Runnable() {
@Override
public void run() {
- exitSpringLoadedDragModeDelayed((resultCode != RESULT_CANCELED),
- EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, null);
+ exitSpringLoadedDragMode((resultCode != RESULT_CANCELED),
+ EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT);
}
};
@@ -635,7 +635,7 @@
final Runnable onComplete = new Runnable() {
@Override
public void run() {
- exitSpringLoadedDragModeDelayed(false, 0, null);
+ exitSpringLoadedDragMode(false, 0);
}
};
@@ -763,8 +763,8 @@
@Override
public void run() {
completeAddAppWidget(appWidgetId, requestArgs, layout, null);
- exitSpringLoadedDragModeDelayed((resultCode != RESULT_CANCELED),
- EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, null);
+ exitSpringLoadedDragMode((resultCode != RESULT_CANCELED),
+ EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT);
}
};
} else if (resultCode == RESULT_CANCELED) {
@@ -1231,7 +1231,7 @@
// If appropriate, either create a folder or add to an existing folder
if (mWorkspace.createUserFolderIfNecessary(view, container, layout, cellXY, 0,
- true, null, null)) {
+ true, null)) {
return;
}
DragObject dragObject = new DragObject();
@@ -1714,8 +1714,8 @@
@Override
public void run() {
// Exit spring loaded mode if necessary after adding the widget
- exitSpringLoadedDragModeDelayed(true, EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT,
- null);
+ exitSpringLoadedDragMode(true, EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT
+ );
}
};
completeAddAppWidget(appWidgetId, info, boundWidget, addFlowHandler.getProviderInfo(this));
@@ -2598,16 +2598,36 @@
return;
}
+ // Lock the orientation:
+ if (mRotationEnabled) {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
+ }
+
+ // Prevent any Un/InstallShortcutReceivers from updating the db while we are
+ // in spring loaded mode
+ InstallShortcutReceiver.enableInstallQueue(InstallShortcutReceiver.FLAG_DRAG_AND_DROP);
+
mStateTransitionAnimation.startAnimationToWorkspace(mState, mWorkspace.getState(),
Workspace.State.SPRING_LOADED, true /* animated */,
null /* onCompleteRunnable */);
setState(State.WORKSPACE_SPRING_LOADED);
}
- public void exitSpringLoadedDragModeDelayed(final boolean successfulDrop, int delay,
+ public void exitSpringLoadedDragMode(final boolean successfulDrop, int delay) {
+ exitSpringLoadedDragMode(successfulDrop, delay, null);
+ }
+
+ public void exitSpringLoadedDragMode(final boolean successfulDrop, int delay,
final Runnable onCompleteRunnable) {
if (!isStateSpringLoaded()) return;
+ // Unlock rotation lock
+ unlockScreenOrientation(false);
+
+ // Re-enable any Un/InstallShortcutReceiver and now process any queued items
+ InstallShortcutReceiver.disableAndFlushInstallQueue(
+ InstallShortcutReceiver.FLAG_DRAG_AND_DROP, this);
+
if (mExitSpringLoadedModeRunnable != null) {
mHandler.removeCallbacks(mExitSpringLoadedModeRunnable);
}
@@ -2621,8 +2641,10 @@
// exitSpringLoadedDragMode made it visible. This is a bit hacky; we should
// clean up our state transition functions
showWorkspace(true, onCompleteRunnable);
- } else {
- exitSpringLoadedDragMode();
+ } else if (mState == State.APPS_SPRING_LOADED) {
+ showAppsView(true /* animated */);
+ } else if (mState == State.WORKSPACE_SPRING_LOADED) {
+ showWorkspace(true);
}
mExitSpringLoadedModeRunnable = null;
}
@@ -2635,14 +2657,6 @@
|| mState == State.WIDGETS_SPRING_LOADED;
}
- public void exitSpringLoadedDragMode() {
- if (mState == State.APPS_SPRING_LOADED) {
- showAppsView(true /* animated */);
- } else if (mState == State.WORKSPACE_SPRING_LOADED) {
- showWorkspace(true);
- }
- }
-
@Override
public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
final boolean result = super.dispatchPopulateAccessibilityEvent(event);
@@ -3398,12 +3412,6 @@
mModel.refreshAndBindWidgetsAndShortcuts(packageUser);
}
- public void lockScreenOrientation() {
- if (mRotationEnabled) {
- setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
- }
- }
-
public void unlockScreenOrientation(boolean immediate) {
if (mRotationEnabled) {
if (immediate) {
diff --git a/src/com/android/launcher3/UninstallDropTarget.java b/src/com/android/launcher3/UninstallDropTarget.java
index e8c4528..4393819 100644
--- a/src/com/android/launcher3/UninstallDropTarget.java
+++ b/src/com/android/launcher3/UninstallDropTarget.java
@@ -97,9 +97,7 @@
@Override
public void onDrop(DragObject d, DragOptions options) {
// Defer onComplete
- if (options.deferCompleteForUninstall) {
- d.dragSource = new DeferredOnComplete(d.dragSource, getContext());
- }
+ d.dragSource = new DeferredOnComplete(d.dragSource, getContext());
super.onDrop(d, options);
}
@@ -171,7 +169,7 @@
}
@Override
- public void onDropCompleted(View target, DragObject d, boolean isFlingToDelete,
+ public void onDropCompleted(View target, DragObject d,
boolean success) {
mDragObject = d;
}
@@ -189,7 +187,7 @@
.getApplicationInfo(mPackageName, PackageManager.MATCH_UNINSTALLED_PACKAGES,
mDragObject.dragInfo.user) == null) {
mDragObject.dragSource = mOriginal;
- mOriginal.onDropCompleted(UninstallDropTarget.this, mDragObject, false, true);
+ mOriginal.onDropCompleted(UninstallDropTarget.this, mDragObject, true);
} else {
sendFailure();
}
@@ -198,7 +196,7 @@
public void sendFailure() {
mDragObject.dragSource = mOriginal;
mDragObject.cancelled = true;
- mOriginal.onDropCompleted(UninstallDropTarget.this, mDragObject, false, false);
+ mOriginal.onDropCompleted(UninstallDropTarget.this, mDragObject, false);
}
}
}
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 1f26965..1525e41 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -237,8 +237,6 @@
final WallpaperOffsetInterpolator mWallpaperOffset;
private boolean mUnlockWallpaperFromDefaultPageOnLayout;
- @Thunk Runnable mDelayedResizeRunnable;
-
// Variables relating to the creation of user folders by hovering shortcuts over shortcuts
private static final int FOLDER_CREATION_TIMEOUT = 0;
public static final int REORDER_TIMEOUT = 350;
@@ -401,9 +399,6 @@
}
updateChildrenLayersEnabled();
- mLauncher.lockScreenOrientation();
- // Prevent any Un/InstallShortcutReceivers from updating the db while we are dragging
- InstallShortcutReceiver.enableInstallQueue(InstallShortcutReceiver.FLAG_DRAG_AND_DROP);
// Do not add a new page if it is a accessible drag which was not started by the workspace.
// We do not support accessibility drag from other sources and instead provide a direct
@@ -453,12 +448,6 @@
}
updateChildrenLayersEnabled();
- mLauncher.unlockScreenOrientation(false);
-
- // Re-enable any Un/InstallShortcutReceiver and now process any queued items
- InstallShortcutReceiver.disableAndFlushInstallQueue(
- InstallShortcutReceiver.FLAG_DRAG_AND_DROP, getContext());
-
mOutlineProvider = null;
mDragSourceInternal = null;
}
@@ -1087,11 +1076,6 @@
}
}
- if (mDelayedResizeRunnable != null && !mIsSwitchingState) {
- mDelayedResizeRunnable.run();
- mDelayedResizeRunnable = null;
- }
-
if (mStripScreensOnPageStopMoving) {
stripEmptyScreens();
mStripScreensOnPageStopMoving = false;
@@ -1744,7 +1728,6 @@
}
});
}
- options.deferCompleteForUninstall = true;
beginDragShared(child, this, options);
}
@@ -1960,8 +1943,7 @@
}
boolean createUserFolderIfNecessary(View newView, long container, CellLayout target,
- int[] targetCell, float distance, boolean external, DragView dragView,
- Runnable postAnimationRunnable) {
+ int[] targetCell, float distance, boolean external, DragView dragView) {
if (distance > mMaxDistanceForFolderCreation) return false;
View v = target.getChildAt(targetCell[0], targetCell[1]);
@@ -2005,8 +1987,8 @@
// folder background to the newly created icon. This preserves animation state.
fi.setFolderBackground(mFolderCreateBg);
mFolderCreateBg = new PreviewBackground();
- fi.performCreateAnimation(destInfo, v, sourceInfo, dragView, folderLocation, scale,
- postAnimationRunnable);
+ fi.performCreateAnimation(destInfo, v, sourceInfo, dragView, folderLocation, scale
+ );
} else {
fi.prepareCreateAnimation(v);
fi.addItem(destInfo);
@@ -2060,13 +2042,14 @@
int snapScreen = -1;
boolean resizeOnDrop = false;
- if (d.dragSource != this) {
+ if (d.dragSource != this || mDragInfo == null) {
final int[] touchXY = new int[] { (int) mDragViewVisualCenter[0],
(int) mDragViewVisualCenter[1] };
onDropExternal(touchXY, dropTargetLayout, d);
- } else if (mDragInfo != null) {
+ } else {
final View cell = mDragInfo.cell;
boolean droppedOnOriginalCellDuringTransition = false;
+ Runnable onCompleteRunnable = null;
if (dropTargetLayout != null && !d.cancelled) {
// Move internally
@@ -2090,12 +2073,11 @@
// If the item being dropped is a shortcut and the nearest drop
// cell also contains a shortcut, then create a folder with the two shortcuts.
if (createUserFolderIfNecessary(cell, container,
- dropTargetLayout, mTargetCell, distance, false, d.dragView, null)) {
- return;
- }
-
- if (addToExistingFolderIfNecessary(cell, dropTargetLayout, mTargetCell,
- distance, d, false)) {
+ dropTargetLayout, mTargetCell, distance, false, d.dragView) ||
+ addToExistingFolderIfNecessary(cell, dropTargetLayout, mTargetCell,
+ distance, d, false)) {
+ mLauncher.exitSpringLoadedDragMode(true,
+ Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT);
return;
}
@@ -2177,7 +2159,7 @@
AppWidgetProviderInfo pInfo = hostView.getAppWidgetInfo();
if (pInfo != null && pInfo.resizeMode != AppWidgetProviderInfo.RESIZE_NONE
&& !d.accessibleDrag) {
- mDelayedResizeRunnable = new Runnable() {
+ onCompleteRunnable = new Runnable() {
public void run() {
if (!isPageInTransition()) {
AppWidgetResizeFrame.showForWidget(hostView, cellLayout);
@@ -2209,9 +2191,9 @@
// Animate the item to its original position, while simultaneously exiting
// spring-loaded mode so the page meets the icon where it was picked up.
mLauncher.getDragController().animateDragViewToOriginalPosition(
- mDelayedResizeRunnable, cell,
+ onCompleteRunnable, cell,
mStateTransitionAnimation.mSpringLoadedTransitionTime);
- mLauncher.exitSpringLoadedDragMode();
+ mLauncher.exitSpringLoadedDragMode(false, 0);
mLauncher.getDropTargetBar().onDragEnd();
parent.onDropChild(cell);
return;
@@ -2226,14 +2208,18 @@
} else {
int duration = snapScreen < 0 ? -1 : ADJACENT_SCREEN_DROP_DURATION;
mLauncher.getDragLayer().animateViewIntoPosition(d.dragView, cell, duration,
- null, this);
+ this);
}
} else {
d.deferDragViewCleanupPostAnimation = false;
cell.setVisibility(VISIBLE);
}
parent.onDropChild(cell);
+
+ mLauncher.exitSpringLoadedDragMode(true,
+ Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, onCompleteRunnable);
}
+
if (d.stateAnnouncer != null && !droppedOnOriginalCell) {
d.stateAnnouncer.completeAction(R.string.item_moved);
}
@@ -2741,14 +2727,6 @@
* to add an item to one of the workspace screens.
*/
private void onDropExternal(final int[] touchXY, final CellLayout cellLayout, DragObject d) {
- final Runnable exitSpringLoadedRunnable = new Runnable() {
- @Override
- public void run() {
- mLauncher.exitSpringLoadedDragModeDelayed(true,
- Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, null);
- }
- };
-
if (d.dragInfo instanceof PendingAddShortcutInfo) {
ShortcutInfo si = ((PendingAddShortcutInfo) d.dragInfo)
.activityInfo.createShortcutInfo();
@@ -2846,6 +2824,9 @@
animationStyle, finalView, true);
} else {
// This is for other drag/drop cases, like dragging from All Apps
+ mLauncher.exitSpringLoadedDragMode(true,
+ Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT);
+
View view;
switch (info.itemType) {
@@ -2874,9 +2855,8 @@
cellLayout, mTargetCell);
float distance = cellLayout.getDistanceFromCell(mDragViewVisualCenter[0],
mDragViewVisualCenter[1], mTargetCell);
- d.postAnimationRunnable = exitSpringLoadedRunnable;
if (createUserFolderIfNecessary(view, container, cellLayout, mTargetCell, distance,
- true, d.dragView, d.postAnimationRunnable)) {
+ true, d.dragView)) {
return;
}
if (addToExistingFolderIfNecessary(view, cellLayout, mTargetCell, distance, d,
@@ -2909,7 +2889,7 @@
// the correct final location.
setFinalTransitionTransform(cellLayout);
mLauncher.getDragLayer().animateViewIntoPosition(d.dragView, view,
- exitSpringLoadedRunnable, this);
+ this);
resetTransitionTransform(cellLayout);
}
}
@@ -3085,7 +3065,7 @@
* Called at the end of a drag which originated on the workspace.
*/
public void onDropCompleted(final View target, final DragObject d,
- final boolean isFlingToDelete, final boolean success) {
+ final boolean success) {
if (success) {
if (target != this && mDragInfo != null) {
@@ -3105,13 +3085,6 @@
mDragInfo.cell.setVisibility(VISIBLE);
}
mDragInfo = null;
-
- if (!isFlingToDelete) {
- // Fling to delete already exits spring loaded mode after the animation finishes.
- mLauncher.exitSpringLoadedDragModeDelayed(success,
- Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, mDelayedResizeRunnable);
- mDelayedResizeRunnable = null;
- }
}
/**
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 91b196e..4de31f4 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -31,10 +31,10 @@
import com.android.launcher3.AppInfo;
import com.android.launcher3.BubbleTextView;
import com.android.launcher3.ClickShadowView;
-import com.android.launcher3.DeleteDropTarget;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.DragSource;
import com.android.launcher3.DropTarget;
+import com.android.launcher3.DropTarget.DragObject;
import com.android.launcher3.Insettable;
import com.android.launcher3.ItemInfo;
import com.android.launcher3.Launcher;
@@ -44,7 +44,6 @@
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.dragndrop.DragController;
import com.android.launcher3.dragndrop.DragOptions;
-import com.android.launcher3.folder.Folder;
import com.android.launcher3.keyboard.FocusedItemDecorator;
import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
import com.android.launcher3.util.PackageUserKey;
@@ -322,21 +321,7 @@
}
@Override
- public void onDropCompleted(View target, DropTarget.DragObject d, boolean isFlingToDelete,
- boolean success) {
- if (isFlingToDelete || !success || (target != mLauncher.getWorkspace() &&
- !(target instanceof DeleteDropTarget) && !(target instanceof Folder))) {
- // Exit spring loaded mode if we have not successfully dropped or have not handled the
- // drop in Workspace
- mLauncher.exitSpringLoadedDragModeDelayed(true,
- Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, null);
- }
- mLauncher.unlockScreenOrientation(false);
-
- if (!success) {
- d.deferDragViewCleanupPostAnimation = false;
- }
- }
+ public void onDropCompleted(View target, DragObject d, boolean success) { }
@Override
public void fillInLogContainerData(View v, ItemInfo info, Target target, Target targetParent) {
diff --git a/src/com/android/launcher3/dragndrop/BaseItemDragListener.java b/src/com/android/launcher3/dragndrop/BaseItemDragListener.java
index 727fb51..96aaee0 100644
--- a/src/com/android/launcher3/dragndrop/BaseItemDragListener.java
+++ b/src/com/android/launcher3/dragndrop/BaseItemDragListener.java
@@ -28,12 +28,10 @@
import android.view.DragEvent;
import android.view.View;
-import com.android.launcher3.DeleteDropTarget;
import com.android.launcher3.DragSource;
-import com.android.launcher3.DropTarget;
+import com.android.launcher3.DropTarget.DragObject;
import com.android.launcher3.Launcher;
import com.android.launcher3.R;
-import com.android.launcher3.folder.Folder;
import com.android.launcher3.widget.PendingItemDragHelper;
import java.util.UUID;
@@ -141,7 +139,7 @@
}
@Override
- public void onPreDragStart(DropTarget.DragObject dragObject) {
+ public void onPreDragStart(DragObject dragObject) {
// The predrag starts when the workspace is not yet loaded. In some cases we set
// the dragLayer alpha to 0 to have a nice fade-in animation. But that will prevent the
// dragView from being visible. Instead just skip the fade-in animation here.
@@ -152,26 +150,14 @@
}
@Override
- public void onPreDragEnd(DropTarget.DragObject dragObject, boolean dragStarted) {
+ public void onPreDragEnd(DragObject dragObject, boolean dragStarted) {
if (dragStarted) {
dragObject.dragView.setColor(0);
}
}
@Override
- public void onDropCompleted(View target, DropTarget.DragObject d, boolean isFlingToDelete,
- boolean success) {
- if (isFlingToDelete || !success || (target != mLauncher.getWorkspace() &&
- !(target instanceof DeleteDropTarget) && !(target instanceof Folder))) {
- // Exit spring loaded mode if we have not successfully dropped or have not handled the
- // drop in Workspace
- mLauncher.exitSpringLoadedDragModeDelayed(true,
- Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, null);
- }
-
- if (!success) {
- d.deferDragViewCleanupPostAnimation = false;
- }
+ public void onDropCompleted(View target, DragObject d, boolean success) {
postCleanup();
}
diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java
index db8f903..31255b7 100644
--- a/src/com/android/launcher3/dragndrop/DragController.java
+++ b/src/com/android/launcher3/dragndrop/DragController.java
@@ -120,6 +120,9 @@
/**
* Starts a drag.
+ * When the drag is started, the UI automatically goes into spring loaded mode. On a successful
+ * drop, it is the responsibility of the {@link DropTarget} to exit out of the spring loaded
+ * mode. If the drop was cancelled for some reason, the UI will automatically exit out of this mode.
*
* @param b The bitmap to display as the drag image. It will be re-scaled to the
* enlarged size.
@@ -248,12 +251,24 @@
mDragObject.cancelled = true;
mDragObject.dragComplete = true;
if (!mIsInPreDrag) {
- mDragObject.dragSource.onDropCompleted(null, mDragObject, false, false);
+ dispatchDropComplete(null, false);
}
}
endDrag();
}
+ private void dispatchDropComplete(View dropTarget, boolean accepted) {
+ if (!accepted) {
+ // If it was not accepted, cleanup the state. If it was accepted, it is the
+ // responsibility of the drop target to cleanup the state.
+ mLauncher.exitSpringLoadedDragMode(false,
+ Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT);
+ mDragObject.deferDragViewCleanupPostAnimation = false;
+ }
+
+ mDragObject.dragSource.onDropCompleted(dropTarget, mDragObject, accepted);
+ }
+
public void onAppsRemoved(ItemInfoMatcher matcher) {
// Cancel the current drag if we are removing an app that we are dragging
if (mDragObject != null) {
@@ -583,8 +598,7 @@
final View dropTargetAsView = dropTarget instanceof View ? (View) dropTarget : null;
if (!mIsInPreDrag) {
mLauncher.getUserEventDispatcher().logDragNDrop(mDragObject, dropTargetAsView);
- mDragObject.dragSource.onDropCompleted(
- dropTargetAsView, mDragObject, flingAnimation != null, accepted);
+ dispatchDropComplete(dropTargetAsView, accepted);
}
}
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java
index 60ce3c3..95223c3 100644
--- a/src/com/android/launcher3/dragndrop/DragLayer.java
+++ b/src/com/android/launcher3/dragndrop/DragLayer.java
@@ -491,13 +491,12 @@
onFinishRunnable, animationEndStyle, duration, null);
}
- public void animateViewIntoPosition(DragView dragView, final View child,
- final Runnable onFinishAnimationRunnable, View anchorView) {
- animateViewIntoPosition(dragView, child, -1, onFinishAnimationRunnable, anchorView);
+ public void animateViewIntoPosition(DragView dragView, final View child, View anchorView) {
+ animateViewIntoPosition(dragView, child, -1, anchorView);
}
public void animateViewIntoPosition(DragView dragView, final View child, int duration,
- final Runnable onFinishAnimationRunnable, View anchorView) {
+ View anchorView) {
ShortcutAndWidgetContainer parentChildren = (ShortcutAndWidgetContainer) child.getParent();
CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams();
parentChildren.measureChild(child);
@@ -554,9 +553,6 @@
Runnable onCompleteRunnable = new Runnable() {
public void run() {
child.setVisibility(VISIBLE);
- if (onFinishAnimationRunnable != null) {
- onFinishAnimationRunnable.run();
- }
}
};
animateViewIntoPosition(dragView, fromX, fromY, toX, toY, 1, 1, 1, toScale, toScale,
diff --git a/src/com/android/launcher3/dragndrop/DragOptions.java b/src/com/android/launcher3/dragndrop/DragOptions.java
index 550f948..f108f8b 100644
--- a/src/com/android/launcher3/dragndrop/DragOptions.java
+++ b/src/com/android/launcher3/dragndrop/DragOptions.java
@@ -38,12 +38,6 @@
public float intrinsicIconScaleFactor = 1f;
/**
- * Whether or not to defer {@link com.android.launcher3.DragSource#onDropCompleted} until
- * uninstall result is available when dropped on uninstall drop target.
- */
- public boolean deferCompleteForUninstall = false;
-
- /**
* Specifies a condition that must be met before DragListener#onDragStart() is called.
* By default, there is no condition and onDragStart() is called immediately following
* DragController#startDrag().
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index b930ad3..4a60d4c 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -283,7 +283,6 @@
}
});
}
- options.deferCompleteForUninstall = true;
mLauncher.getWorkspace().beginDragShared(v, this, options);
}
@@ -850,7 +849,7 @@
}
public void onDropCompleted(final View target, final DragObject d,
- final boolean isFlingToDelete, final boolean success) {
+ final boolean success) {
if (success) {
if (mDeleteFolderOnDropCompleted && !mItemAddedBackToSelfViaIcon && target != this) {
@@ -898,12 +897,6 @@
mInfo.setOption(FolderInfo.FLAG_MULTI_PAGE_ANIMATION, false,
mLauncher.getModelWriter());
}
-
- if (!isFlingToDelete) {
- // Fling to delete already exits spring loaded mode after the animation finishes.
- mLauncher.exitSpringLoadedDragModeDelayed(success,
- Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, null);
- }
}
private void updateItemLocationsInDatabaseBatch() {
@@ -1158,21 +1151,6 @@
}
public void onDrop(DragObject d, DragOptions options) {
- Runnable cleanUpRunnable = null;
-
- // If we are coming from All Apps space, we defer removing the extra empty screen
- // until the folder closes
- if (d.dragSource != mLauncher.getWorkspace() && !(d.dragSource instanceof Folder)) {
- cleanUpRunnable = new Runnable() {
- @Override
- public void run() {
- mLauncher.exitSpringLoadedDragModeDelayed(true,
- Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT,
- null);
- }
- };
- }
-
// If the icon was dropped while the page was being scrolled, we need to compute
// the target location again such that the icon is placed of the final page.
if (!mContent.rankOnCurrentPage(mEmptyCellRank)) {
@@ -1238,8 +1216,7 @@
float scaleY = getScaleY();
setScaleX(1.0f);
setScaleY(1.0f);
- mLauncher.getDragLayer().animateViewIntoPosition(d.dragView, currentDragView,
- cleanUpRunnable, null);
+ mLauncher.getDragLayer().animateViewIntoPosition(d.dragView, currentDragView, null);
setScaleX(scaleX);
setScaleY(scaleY);
} else {
@@ -1264,6 +1241,8 @@
mInfo.setOption(FolderInfo.FLAG_MULTI_PAGE_ANIMATION, true, mLauncher.getModelWriter());
}
+ mLauncher.exitSpringLoadedDragMode(true,
+ Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT);
if (d.stateAnnouncer != null) {
d.stateAnnouncer.completeAction(R.string.item_moved);
}
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index 3998888..d469eb2 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -254,7 +254,7 @@
public void performCreateAnimation(final ShortcutInfo destInfo, final View destView,
final ShortcutInfo srcInfo, final DragView srcView, Rect dstRect,
- float scaleRelativeToDragLayer, Runnable postAnimationRunnable) {
+ float scaleRelativeToDragLayer) {
prepareCreateAnimation(destView);
addItem(destInfo);
// This will animate the first item from it's position as an icon into its
@@ -263,7 +263,7 @@
.start();
// This will animate the dragView (srcView) into the new folder
- onDrop(srcInfo, srcView, dstRect, scaleRelativeToDragLayer, 1, postAnimationRunnable,
+ onDrop(srcInfo, srcView, dstRect, scaleRelativeToDragLayer, 1,
false /* itemReturnedOnFailedDrop */);
}
@@ -279,7 +279,7 @@
}
private void onDrop(final ShortcutInfo item, DragView animateView, Rect finalRect,
- float scaleRelativeToDragLayer, int index, Runnable postAnimationRunnable,
+ float scaleRelativeToDragLayer, int index,
boolean itemReturnedOnFailedDrop) {
item.cellX = -1;
item.cellY = -1;
@@ -351,7 +351,7 @@
dragLayer.animateView(animateView, from, to, finalAlpha,
1, 1, finalScale, finalScale, DROP_IN_ANIMATION_DURATION,
new DecelerateInterpolator(2), new AccelerateInterpolator(2),
- postAnimationRunnable, DragLayer.ANIMATION_END_DISAPPEAR, null);
+ null, DragLayer.ANIMATION_END_DISAPPEAR, null);
mFolder.hideItem(item);
@@ -381,7 +381,7 @@
item = (ShortcutInfo) d.dragInfo;
}
mFolder.notifyDrop();
- onDrop(item, d.dragView, null, 1.0f, mInfo.contents.size(), d.postAnimationRunnable,
+ onDrop(item, d.dragView, null, 1.0f, mInfo.contents.size(),
itemReturnedOnFailedDrop);
}
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 68b547d..4435afb 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -39,6 +39,7 @@
import com.android.launcher3.BubbleTextView;
import com.android.launcher3.DragSource;
import com.android.launcher3.DropTarget;
+import com.android.launcher3.DropTarget.DragObject;
import com.android.launcher3.ItemInfo;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherAnimUtils;
@@ -487,14 +488,7 @@
}
@Override
- public void onDropCompleted(View target, DropTarget.DragObject d, boolean isFlingToDelete,
- boolean success) {
- if (!success) {
- d.dragView.remove();
- mLauncher.showWorkspace(true);
- mLauncher.getDropTargetBar().onDragEnd();
- }
- }
+ public void onDropCompleted(View target, DragObject d, boolean success) { }
@Override
public void onDragStart(DropTarget.DragObject dragObject, DragOptions options) {
diff --git a/src/com/android/launcher3/util/FlingAnimation.java b/src/com/android/launcher3/util/FlingAnimation.java
index d475ee9..15f5af6 100644
--- a/src/com/android/launcher3/util/FlingAnimation.java
+++ b/src/com/android/launcher3/util/FlingAnimation.java
@@ -95,7 +95,7 @@
Runnable onAnimationEndRunnable = new Runnable() {
@Override
public void run() {
- mLauncher.exitSpringLoadedDragMode();
+ mLauncher.exitSpringLoadedDragMode(false, 0);
mDropTarget.completeDrop(mDragObject);
}
};
diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java
index ee5dd66b..b6b3089 100644
--- a/src/com/android/launcher3/widget/BaseWidgetSheet.java
+++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java
@@ -159,21 +159,7 @@
//
@Override
- public void onDropCompleted(View target, DragObject d, boolean isFlingToDelete,
- boolean success) {
- if (isFlingToDelete || !success || (target != mLauncher.getWorkspace() &&
- !(target instanceof DeleteDropTarget) && !(target instanceof Folder))) {
- // Exit spring loaded mode if we have not successfully dropped or have not handled the
- // drop in Workspace
- mLauncher.exitSpringLoadedDragModeDelayed(true,
- Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, null);
- }
- mLauncher.unlockScreenOrientation(false);
-
- if (!success) {
- d.deferDragViewCleanupPostAnimation = false;
- }
- }
+ public void onDropCompleted(View target, DragObject d, boolean success) { }
@Override