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

Commit 16126eed authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I0e4cedbf,Idfa1b82c into sc-dev 

* changes:
  Add instanceId to LAUNCHER_FOLDER_CONVERTED_TO_ICON log event.
  Fixes wrong container for LAUNCHER_ITEM_DROP_COMPLETED log event.
parents 0f16e514 03f8dcb8

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/dragndrop/DragController.java

+7 −0
Original line number Diff line number Diff line
@@ -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<InstanceId> getLogInstanceId() {

        return Optional.ofNullable(mDragObject)

                .map(dragObject -> dragObject.logInstanceId);

    }



    /**

     * Call this from a drag source view like this:

     *

src/com/android/launcher3/folder/Folder.java

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

                    }

                }

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())