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

Commit 4b26b214 authored by Zak Cohen's avatar Zak Cohen Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Use autogenerated SysUiStatsLog for statsd logging"""... 

Merge "Revert "Revert "Use autogenerated SysUiStatsLog for statsd logging""" into ub-launcher3-master
parents 7db9e7b9 ef01e6e8

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

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

    }