Add instanceId to LAUNCHER_FOLDER_CONVERTED_TO_ICON log event. (03f8dcb8) · Commits · e / os / android_packages_apps_Trebuchet

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:
		*

+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);
		}
		}