From ef01e6e86babece0bd98240c03699b465cc6dbfa Mon Sep 17 00:00:00 2001 From: Zak Cohen Date: Mon, 27 Jan 2020 23:49:12 +0000 Subject: [PATCH] Revert "Revert "Use autogenerated SysUiStatsLog for statsd logging"" This reverts commit 3b7209d0d60f479c820ecdf62cdbd943b4d3b534. Reason for revert: replacing after the lib drop Change-Id: Ide0a88da611d4a9dfe0c7ba980fabdc14ac96b31 --- .../quickstep/logging/StatsLogCompatManager.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java index a466f12b0d..53859ad5bf 100644 --- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java +++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java @@ -43,7 +43,7 @@ import com.android.launcher3.userevent.nano.LauncherLogProto.ControlType; import com.android.launcher3.userevent.nano.LauncherLogProto.ItemType; import com.android.launcher3.userevent.nano.LauncherLogProto.Target; import com.android.launcher3.util.ComponentKey; -import com.android.systemui.shared.system.StatsLogCompat; +import com.android.systemui.shared.system.SysUiStatsLog; import com.google.protobuf.nano.MessageNano; @@ -72,8 +72,8 @@ public class StatsLogCompatManager extends StatsLogManager { if (ext.srcTarget[0] != null) { ext.srcTarget[0].item = LauncherTarget.APP_ICON; } - StatsLogCompat.write(LAUNCH_APP, srcState, BACKGROUND /* dstState */, - MessageNano.toByteArray(ext), true); + SysUiStatsLog.write(SysUiStatsLog.LAUNCHER_EVENT, LAUNCH_APP, srcState, + BACKGROUND /* dstState */, MessageNano.toByteArray(ext), true); } @Override @@ -82,8 +82,8 @@ public class StatsLogCompatManager extends StatsLogManager { ext.srcTarget = new LauncherTarget[SUPPORTED_TARGET_DEPTH]; int srcState = OVERVIEW; fillInLauncherExtension(v, ext); - StatsLogCompat.write(LAUNCH_TASK, srcState, BACKGROUND /* dstState */, - MessageNano.toByteArray(ext), true); + SysUiStatsLog.write(SysUiStatsLog.LAUNCHER_EVENT, LAUNCH_TASK, srcState, + BACKGROUND /* dstState */, MessageNano.toByteArray(ext), true); } @Override @@ -92,8 +92,8 @@ public class StatsLogCompatManager extends StatsLogManager { ext.srcTarget = new LauncherTarget[SUPPORTED_TARGET_DEPTH]; int srcState = OVERVIEW; fillInLauncherExtension(v, ext); - StatsLogCompat.write(DISMISS_TASK, srcState, BACKGROUND /* dstState */, - MessageNano.toByteArray(ext), true); + SysUiStatsLog.write(SysUiStatsLog.LAUNCHER_EVENT, DISMISS_TASK, srcState, + BACKGROUND /* dstState */, MessageNano.toByteArray(ext), true); } @Override @@ -103,7 +103,7 @@ public class StatsLogCompatManager extends StatsLogManager { int srcState = mStateProvider.getCurrentState(); fillInLauncherExtensionWithPageId(ext, pageId); int launcherAction = isSwipingToLeft ? Launcher.SWIPE_LEFT : Launcher.SWIPE_RIGHT; - StatsLogCompat.write(launcherAction, srcState, srcState, + SysUiStatsLog.write(SysUiStatsLog.LAUNCHER_EVENT, launcherAction, srcState, srcState, MessageNano.toByteArray(ext), true); }