diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-12-13 19:37:10 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-12-13 23:39:16 -0800 |
commit | 0f76b56865bd7b63bd21d53aaac47300396aa38f (patch) | |
tree | 1b5bd8b01b2860cc1597d6371056c288a199cb55 /src/com/android/launcher3/widget/WidgetsContainerView.java | |
parent | 466c4131d88fc951c8eaef7f1f7ade5ac91221e4 (diff) | |
download | android_packages_apps_Trebuchet-0f76b56865bd7b63bd21d53aaac47300396aa38f.tar.gz android_packages_apps_Trebuchet-0f76b56865bd7b63bd21d53aaac47300396aa38f.tar.bz2 android_packages_apps_Trebuchet-0f76b56865bd7b63bd21d53aaac47300396aa38f.zip |
Refactoring FlingToDelete
> Moving all fling related logic to FlingToDeleteHelper from DragController
> Removing fling related methods from DragSource and DropTarget
> Moving fling animation logic from DeleteDropTarget to FlingAnimation
> Simplifying DropTargetBar to directly look for all valid drop targets.
This makes it easier to add new DropTarget in xml.
Change-Id: I7214d2d30c907ab93c80d92d9f9be6dda2d63354
Diffstat (limited to 'src/com/android/launcher3/widget/WidgetsContainerView.java')
-rw-r--r-- | src/com/android/launcher3/widget/WidgetsContainerView.java | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/com/android/launcher3/widget/WidgetsContainerView.java b/src/com/android/launcher3/widget/WidgetsContainerView.java index 2e1294251..165d12ef8 100644 --- a/src/com/android/launcher3/widget/WidgetsContainerView.java +++ b/src/com/android/launcher3/widget/WidgetsContainerView.java @@ -31,8 +31,6 @@ import com.android.launcher3.BaseContainerView; import com.android.launcher3.DeleteDropTarget; import com.android.launcher3.DragSource; import com.android.launcher3.DropTarget.DragObject; -import com.android.launcher3.dragndrop.DragOptions; -import com.android.launcher3.folder.Folder; import com.android.launcher3.IconCache; import com.android.launcher3.ItemInfo; import com.android.launcher3.Launcher; @@ -42,10 +40,11 @@ import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.WidgetPreviewLoader; import com.android.launcher3.dragndrop.DragController; +import com.android.launcher3.dragndrop.DragOptions; +import com.android.launcher3.folder.Folder; import com.android.launcher3.graphics.LauncherIcons; import com.android.launcher3.model.PackageItemInfo; import com.android.launcher3.model.WidgetItem; -import com.android.launcher3.model.WidgetsModel; import com.android.launcher3.userevent.nano.LauncherLogProto; import com.android.launcher3.userevent.nano.LauncherLogProto.Target; import com.android.launcher3.util.MultiHashMap; @@ -246,11 +245,6 @@ public class WidgetsContainerView extends BaseContainerView // @Override - public boolean supportsFlingToDelete() { - return true; - } - - @Override public boolean supportsAppInfoDropTarget() { return true; } @@ -270,14 +264,6 @@ public class WidgetsContainerView extends BaseContainerView } @Override - public void onFlingToDeleteCompleted() { - // We just dismiss the drag when we fling, so cleanup here - mLauncher.exitSpringLoadedDragModeDelayed(true, - Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, null); - mLauncher.unlockScreenOrientation(false); - } - - @Override public void onDropCompleted(View target, DragObject d, boolean isFlingToDelete, boolean success) { if (LOGD) { |