Merge "Log tap on app info within task menu." into ub-launcher3-rvc-dev (7a41d1e9) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/recents_ui_overrides/src/com/android/quickstep/TaskShortcutFactory.java

+11 −1

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import android.view.View;
		import com.android.launcher3.BaseDraggingActivity;
		import com.android.launcher3.DeviceProfile;
		import com.android.launcher3.R;
		import com.android.launcher3.logger.LauncherAtom;
		import com.android.launcher3.logging.StatsLogManager.LauncherEvent;
		import com.android.launcher3.model.WellbeingModel;
		import com.android.launcher3.model.data.WorkspaceItemInfo;
		@@ -71,7 +72,16 @@ public interface TaskShortcutFactory {
		static WorkspaceItemInfo dummyInfo(TaskView view) {
		Task task = view.getTask();

		WorkspaceItemInfo dummyInfo = new WorkspaceItemInfo();
		WorkspaceItemInfo dummyInfo = new WorkspaceItemInfo(){
		/**
		* Helps to log events as {@link LauncherAtom.Task}
		* instead of {@link LauncherAtom.ItemInfo}.
		*/
		@Override
		public LauncherAtom.ItemInfo buildProto() {
		return view.buildProto();
		}
		};
		dummyInfo.intent = new Intent();
		ComponentName component = task.getTopComponent();
		dummyInfo.getIntent().setComponent(component);

+3 −1

Original line number	Diff line number	Diff line
		@@ -223,7 +223,9 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
		setOutlineProvider(mOutlineProvider);
		}

		/** Builds proto for logging */
		/**
		* Builds proto for logging
		*/
		public LauncherAtom.ItemInfo buildProto() {
		ComponentKey componentKey = TaskUtils.getLaunchComponentKeyForTask(getTask().key);
		LauncherAtom.ItemInfo.Builder itemBuilder = LauncherAtom.ItemInfo.newBuilder();

+3 −2

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import com.android.launcher3.util.PackageUserKey;
		import com.android.launcher3.widget.WidgetsBottomSheet;

		import java.util.List;

		/**
		* Represents a system shortcut for a given app. The shortcut should have a label and icon, and an
		* onClickListener that depends on the item that the shortcut services.
		@@ -142,8 +143,8 @@ public abstract class SystemShortcut<T extends BaseDraggingActivity> extends Ite
		mTarget.getUserEventDispatcher().logActionOnControl(Action.Touch.TAP,
		ControlType.APPINFO_TARGET, view);
		// TODO(thiruram): Fix missing container info when item is inside folder.
		mTarget.getStatsLogManager().log(LAUNCHER_SYSTEM_SHORTCUT_APP_INFO_TAP,
		mItemInfo.buildProto());
		mTarget.getStatsLogManager()
		.log(LAUNCHER_SYSTEM_SHORTCUT_APP_INFO_TAP, mItemInfo.buildProto());
		}
		}