diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 8a45c81d97..4b95372035 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1706,10 +1706,9 @@ public class Workspace extends PagedView if (dropOverView instanceof FolderIcon) { FolderIcon fi = (FolderIcon) dropOverView; if (fi.acceptDrop(d.dragInfo)) { - mStatsLogManager.logger().withItemInfo(d.dragInfo).withInstanceId(d.logInstanceId) - .log(LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED); + mStatsLogManager.logger().withItemInfo(fi.mInfo).withInstanceId(d.logInstanceId) + .log(LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED_ON_FOLDER_ICON); fi.onDrop(d, false /* itemReturnedOnFailedDrop */); - // if the drag started here, we need to remove it from the workspace if (!external) { getParentCellLayoutForView(mDragInfo.cell).removeView(mDragInfo.cell); diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java index 1cfe6acf05..93df599a81 100644 --- a/src/com/android/launcher3/dragndrop/DragController.java +++ b/src/com/android/launcher3/dragndrop/DragController.java @@ -40,12 +40,14 @@ import com.android.launcher3.DropTarget; import com.android.launcher3.Launcher; import com.android.launcher3.R; import com.android.launcher3.accessibility.DragViewStateAnnouncer; +import com.android.launcher3.logging.InstanceId; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.util.ItemInfoMatcher; import com.android.launcher3.util.TouchController; import java.util.ArrayList; +import java.util.Optional; /** * Class for initiating a drag within a view or across multiple views. @@ -230,6 +232,11 @@ public class DragController implements DragDriver.EventListener, TouchController } } + public Optional getLogInstanceId() { + return Optional.ofNullable(mDragObject) + .map(dragObject -> dragObject.logInstanceId); + } + /** * Call this from a drag source view like this: * diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index 61938d1719..74d8dca98d 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -1208,7 +1208,9 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo newIcon.requestFocus(); } if (finalItem != null) { - mStatsLogManager.logger().withItemInfo(finalItem) + StatsLogger logger = mStatsLogManager.logger().withItemInfo(finalItem); + mDragController.getLogInstanceId().map(logger::withInstanceId) + .orElse(logger) .log(LAUNCHER_FOLDER_CONVERTED_TO_ICON); } } diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java index 071b2634a1..cc80a88f94 100644 --- a/src/com/android/launcher3/logging/StatsLogManager.java +++ b/src/com/android/launcher3/logging/StatsLogManager.java @@ -95,9 +95,13 @@ public class StatsLogManager implements ResourceBasedOverride { @UiEvent(doc = "User dragged a launcher item") LAUNCHER_ITEM_DRAG_STARTED(383), - @UiEvent(doc = "A dragged launcher item is successfully dropped") + @UiEvent(doc = "A dragged launcher item is successfully dropped onto workspace, hotseat " + + "open folder etc") LAUNCHER_ITEM_DROP_COMPLETED(385), + @UiEvent(doc = "A dragged launcher item is successfully dropped onto a folder icon.") + LAUNCHER_ITEM_DROP_COMPLETED_ON_FOLDER_ICON(697), + @UiEvent(doc = "A dragged launcher item is successfully dropped on another item " + "resulting in a new folder creation") LAUNCHER_ITEM_DROP_FOLDER_CREATED(386), diff --git a/src/com/android/launcher3/model/data/FolderInfo.java b/src/com/android/launcher3/model/data/FolderInfo.java index cc783f7a5e..cd2ef35a66 100644 --- a/src/com/android/launcher3/model/data/FolderInfo.java +++ b/src/com/android/launcher3/model/data/FolderInfo.java @@ -34,6 +34,7 @@ import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.folder.FolderNameInfos; import com.android.launcher3.logger.LauncherAtom; import com.android.launcher3.logger.LauncherAtom.Attribute; +import com.android.launcher3.logger.LauncherAtom.FolderIcon; import com.android.launcher3.logger.LauncherAtom.FromState; import com.android.launcher3.logger.LauncherAtom.ToState; import com.android.launcher3.model.ModelWriter; @@ -208,8 +209,13 @@ public class FolderInfo extends ItemInfo { @Override public LauncherAtom.ItemInfo buildProto(FolderInfo fInfo) { + FolderIcon.Builder folderIcon = FolderIcon.newBuilder() + .setCardinality(contents.size()); + if (LabelState.SUGGESTED.equals(getLabelState())) { + folderIcon.setLabelInfo(title.toString()); + } return getDefaultItemInfoBuilder() - .setFolderIcon(LauncherAtom.FolderIcon.newBuilder().setCardinality(contents.size())) + .setFolderIcon(folderIcon) .setRank(rank) .setAttribute(getLabelState().mLogAttribute) .setContainerInfo(getContainerInfo())