Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7823402e authored by thiruram's avatar thiruram
Browse files

Fixes wrong container for LAUNCHER_ITEM_DROP_COMPLETED log event. 

Bug: 179532038
Change-Id: Idfa1b82c35338a7472ff80d94fb20c69e498a028
parent ea826f87

src/com/android/launcher3/Workspace.java

+2 −3
Original line number Diff line number Diff line
@@ -1706,10 +1706,9 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 
        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);

src/com/android/launcher3/logging/StatsLogManager.java

+5 −1
Original line number Diff line number Diff line
@@ -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),

src/com/android/launcher3/model/data/FolderInfo.java

+7 −1
Original line number Diff line number Diff line
@@ -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())