diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2016-09-01 21:51:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-01 21:51:25 +0000 |
| commit | 61bcfba33598ddd0bc59910ab758fcd51d770502 (patch) | |
| tree | 5aa5b8620ed3e8192200abe95d22779637edd7e0 /src/com/android/launcher3/Workspace.java | |
| parent | 3cc2d8b3dd0562539a7a988e1b5e6d4bd225ee1f (diff) | |
| parent | 59a238095e82fd02355f4cb53abe01655a50b051 (diff) | |
| download | android_packages_apps_Trebuchet-61bcfba33598ddd0bc59910ab758fcd51d770502.tar.gz android_packages_apps_Trebuchet-61bcfba33598ddd0bc59910ab758fcd51d770502.tar.bz2 android_packages_apps_Trebuchet-61bcfba33598ddd0bc59910ab758fcd51d770502.zip | |
Merge "Support user event logging for drag and drop b/30039490" into ub-launcher3-calgary-polish
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 88eeac677..66745abab 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -100,7 +100,7 @@ import java.util.HashSet; public class Workspace extends PagedView implements DropTarget, DragSource, DragScroller, View.OnTouchListener, DragController.DragListener, LauncherTransitionable, ViewGroup.OnHierarchyChangeListener, - Insettable, DropTargetSource, AccessibilityDragSource, UserEventDispatcher.LaunchSourceProvider { + Insettable, DropTargetSource, AccessibilityDragSource { private static final String TAG = "Launcher.Workspace"; private static boolean ENFORCE_DRAG_EVENT_ORDER = false; @@ -3426,6 +3426,7 @@ public class Workspace extends PagedView if (info.container == NO_ID && info instanceof AppInfo) { // Came from all apps -- make a copy info = ((AppInfo) info).makeShortcut(); + d.dragInfo = info; } view = mLauncher.createShortcut(cellLayout, (ShortcutInfo) info); break; @@ -4295,6 +4296,12 @@ public class Workspace extends PagedView target.gridY = info.cellY; target.pageIndex = getCurrentPage(); targetParent.containerType = LauncherLogProto.WORKSPACE; + if (info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) { + target.rank = info.rank; + targetParent.containerType = LauncherLogProto.HOTSEAT; + } else if (info.container >= 0) { + targetParent.containerType = LauncherLogProto.FOLDER; + } } /** |