diff options
| author | Tony <tonyswickham@gmail.com> | 2016-09-23 19:42:53 -0700 |
|---|---|---|
| committer | Tony <twickham@google.com> | 2016-09-23 19:43:35 -0700 |
| commit | 5eea1e89dd7e100851d97968855b2868d01e7faa (patch) | |
| tree | 479d9a4679474d812357bc35ffbb1e64f9a8190b /src/com/android/launcher3/Workspace.java | |
| parent | 20eedeb5ae4cddb3d9de0701e80509f07a9fe3b9 (diff) | |
| parent | 6e74e899d314663415f54895227bb79a51fd734b (diff) | |
| download | android_packages_apps_Trebuchet-5eea1e89dd7e100851d97968855b2868d01e7faa.tar.gz android_packages_apps_Trebuchet-5eea1e89dd7e100851d97968855b2868d01e7faa.tar.bz2 android_packages_apps_Trebuchet-5eea1e89dd7e100851d97968855b2868d01e7faa.zip | |
resolve merge conflicts of 6e74e89 to ub-launcher3-master
Change-Id: I34e449ca3a91ee06e1983ac3a83cb7ca53567a91
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index ee4fc9191..977395fc7 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -73,8 +73,6 @@ import com.android.launcher3.dragndrop.SpringLoadedDragController; import com.android.launcher3.folder.Folder; import com.android.launcher3.folder.FolderIcon; import com.android.launcher3.graphics.DragPreviewProvider; -import com.android.launcher3.shortcuts.DeepShortcutManager; -import com.android.launcher3.shortcuts.ShortcutsContainerListener; import com.android.launcher3.userevent.nano.LauncherLogProto; import com.android.launcher3.userevent.nano.LauncherLogProto.Target; import com.android.launcher3.util.ItemInfoMatcher; @@ -1174,10 +1172,6 @@ public class Workspace extends PagedView if (!(child instanceof Folder)) { child.setHapticFeedbackEnabled(false); child.setOnLongClickListener(mLongClickListener); - if (child instanceof BubbleTextView && DeepShortcutManager.supportsShortcuts(info)) { - // TODO: only add this listener if the item has shortcuts associated with it. - child.setOnTouchListener(new ShortcutsContainerListener((BubbleTextView) child)); - } } if (child instanceof DropTarget) { mDragController.addDropTarget((DropTarget) child); |