Add support to log LauncherEvent without ItemInfo. (b9080c2a) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java

+28 −4

Original line number	Diff line number	Diff line
		@@ -64,24 +64,46 @@ public class StatsLogCompatManager extends StatsLogManager {
		}

		/**
		* Logs an event and accompanying {@link ItemInfo}
		* Logs a {@link LauncherEvent}.
		*/
		@Override
		public void log(LauncherEvent event) {
		log(event, DEFAULT_INSTANCE_ID, LauncherAtom.ItemInfo.getDefaultInstance());
		}

		/**
		* Logs an event and accompanying {@link InstanceId}.
		*/
		@Override
		public void log(LauncherEvent event, InstanceId instanceId) {
		log(event, instanceId, LauncherAtom.ItemInfo.getDefaultInstance());
		}

		/**
		* Logs an event and accompanying {@link ItemInfo}.
		*/
		@Override
		public void log(LauncherEvent event, LauncherAtom.ItemInfo itemInfo) {
		log(event, DEFAULT_INSTANCE_ID, itemInfo);
		}

		/**
		* Logs an event and accompanying {@link LauncherAtom.ItemInfo}
		* Logs an event and accompanying {@link InstanceId} and {@link LauncherAtom.ItemInfo}.
		*/
		@Override
		public void log(LauncherEvent event, InstanceId instanceId, LauncherAtom.ItemInfo itemInfo) {
		if (IS_VERBOSE) {
		Log.d(TAG, String.format("\n%s\n%s", event.name(), itemInfo));
		Log.d(TAG, instanceId == DEFAULT_INSTANCE_ID
		? String.format("\n%s\n%s", event.name(), itemInfo)
		: String.format("%s(InstanceId:%s)\n%s", event.name(), instanceId, itemInfo));
		}

		if (!Utilities.ATLEAST_R) {
		return;
		}
		SysUiStatsLog.write(SysUiStatsLog.LAUNCHER_EVENT,

		SysUiStatsLog.write(
		SysUiStatsLog.LAUNCHER_EVENT,
		SysUiStatsLog.LAUNCHER_UICHANGED__ACTION__DEFAULT_ACTION /* deprecated */,
		SysUiStatsLog.LAUNCHER_UICHANGED__DST_STATE__HOME /* TODO */,
		SysUiStatsLog.LAUNCHER_UICHANGED__DST_STATE__BACKGROUND /* TODO */,
		@@ -118,6 +140,7 @@ public class StatsLogCompatManager extends StatsLogManager {
		}

		private class SnapshotWorker extends BaseModelUpdateTask {

		@Override
		public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) {
		IntSparseArrayMap<FolderInfo> folders = dataModel.folders.clone();
		@@ -140,6 +163,7 @@ public class StatsLogCompatManager extends StatsLogManager {
		}
		}
		}

		private static void writeSnapshot(LauncherAtom.ItemInfo itemInfo) {
		if (IS_VERBOSE) {
		Log.d(TAG, "\nwriteSnapshot:" + itemInfo);

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

+19 −11

Original line number	Diff line number	Diff line
		@@ -16,10 +16,8 @@
		package com.android.launcher3.logging;

		import android.content.Context;
		import android.util.Log;

		import com.android.launcher3.R;
		import com.android.launcher3.logger.LauncherAtom;
		import com.android.launcher3.logger.LauncherAtom.ItemInfo;
		import com.android.launcher3.logging.StatsLogUtils.LogStateProvider;
		import com.android.launcher3.util.ResourceBasedOverride;
		@@ -32,8 +30,6 @@ import com.android.launcher3.util.ResourceBasedOverride;
		*/
		public class StatsLogManager implements ResourceBasedOverride {

		private static final String TAG = "StatsLogManager";

		interface EventEnum {
		int getId();
		}
		@@ -84,9 +80,11 @@ public class StatsLogManager implements ResourceBasedOverride {
		// ADD MORE

		private final int mId;

		LauncherEvent(int id) {
		mId = id;
		}

		public int getId() {
		return mId;
		}
		@@ -109,22 +107,32 @@ public class StatsLogManager implements ResourceBasedOverride {
		}

		/**
		* Logs an event and accompanying {@link ItemInfo}
		* Logs a {@link LauncherEvent}.
		*/
		public void log(LauncherEvent event) {
		}

		/**
		* Logs an event and accompanying {@link InstanceId}.
		*/
		public void log(LauncherEvent event, InstanceId instanceId) {
		Log.d(TAG, String.format("%s(InstanceId:%s)", event.name(), instanceId));
		// Call StatsLog method
		}

		/**
		* Logs an event and accompanying {@link LauncherAtom.ItemInfo}
		* Logs an event and accompanying {@link ItemInfo}.
		*/
		public void log(LauncherEvent event, InstanceId instanceId, LauncherAtom.ItemInfo itemInfo) { }
		public void log(LauncherEvent event, LauncherAtom.ItemInfo itemInfo) { }
		public void log(LauncherEvent event, ItemInfo itemInfo) {
		}

		/**
		* Logs an event and accompanying {@link InstanceId} and {@link ItemInfo}.
		*/
		public void log(LauncherEvent event, InstanceId instanceId, ItemInfo itemInfo) {
		}

		/**
		* Logs snapshot, or impression of the current workspace.
		*/
		public void logSnapshot() { }
		public void logSnapshot() {
		}
		}