diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2016-04-12 18:32:04 -0700 |
---|---|---|
committer | Hyunyoung Song <hyunyoungs@google.com> | 2016-04-13 10:58:33 -0700 |
commit | ddec1c739ef37c3a042982b8943fe42e04b65f4c (patch) | |
tree | 565933d46552049c8af29e8615964e47919fd81c /src/com/android/launcher3/logging/LoggerUtils.java | |
parent | 30a716157b748258e5461fe783298ba7c740835f (diff) | |
download | android_packages_apps_Trebuchet-ddec1c739ef37c3a042982b8943fe42e04b65f4c.tar.gz android_packages_apps_Trebuchet-ddec1c739ef37c3a042982b8943fe42e04b65f4c.tar.bz2 android_packages_apps_Trebuchet-ddec1c739ef37c3a042982b8943fe42e04b65f4c.zip |
Refactor UserEventLogging, Add predictedRank, replace Bundle with Proto
b/26494415
- Removed bundle object that became redundant now that we have LauncherEvent proto
- Combined Stats and UserEventLogger as they are effectively doing same thing
- Removed parent field inside Target
- added predictedRank target inside Target
b/27967359
- make com.android.launcher3.action.LAUNCH broadcast explicit
Later CL: finish packageName/intent/componentHash/predictedRank fields
Change-Id: I441fb46c834f73e58a4d2324e8da7971e8713ec8
Diffstat (limited to 'src/com/android/launcher3/logging/LoggerUtils.java')
-rw-r--r-- | src/com/android/launcher3/logging/LoggerUtils.java | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/src/com/android/launcher3/logging/LoggerUtils.java b/src/com/android/launcher3/logging/LoggerUtils.java index 4b30384f2..584e38e9e 100644 --- a/src/com/android/launcher3/logging/LoggerUtils.java +++ b/src/com/android/launcher3/logging/LoggerUtils.java @@ -5,7 +5,6 @@ import android.util.Log; import com.android.launcher3.LauncherSettings; import com.android.launcher3.ShortcutInfo; -import com.android.launcher3.Stats; import com.android.launcher3.userevent.nano.LauncherLogProto; import com.android.launcher3.userevent.nano.LauncherLogProto.Action; import com.android.launcher3.userevent.nano.LauncherLogProto.Target; @@ -18,16 +17,6 @@ import com.android.launcher3.userevent.nano.LauncherLogProto.Target; */ public class LoggerUtils { private static final String TAG = "LoggerUtils"; - private static final boolean DEBUG = false; - - static int getContainerType(ShortcutInfo shortcut) { - switch ((int) shortcut.container) { - case LauncherSettings.Favorites.CONTAINER_DESKTOP: return LauncherLogProto.WORKSPACE; - case LauncherSettings.Favorites.CONTAINER_HOTSEAT: return LauncherLogProto.HOTSEAT; - default: - return (int) shortcut.container; - } - } public static String getActionStr(LauncherLogProto.Action action) { switch(action.touch) { @@ -62,8 +51,10 @@ public class LoggerUtils { default: typeStr = "UNKNOWN"; } - return typeStr + " " + t.packageNameHash + " grid=(" + t.gridX + "," + t.gridY + ") " - + getContainerStr(t.parent); + return typeStr + ", packageHash=" + t.packageNameHash + + ", componentHash=" + t.componentHash + + ", intentHash=" + t.intentHash + + ", grid=(" + t.gridX + "," + t.gridY + "), id=" + t.pageIndex; } private static String getControlStr(Target t) { @@ -76,7 +67,6 @@ public class LoggerUtils { case LauncherLogProto.UNINSTALL_TARGET: return "UNINSTALL_TARGET"; case LauncherLogProto.APPINFO_TARGET: return "APPINFO_TARGET"; case LauncherLogProto.RESIZE_HANDLE: return "RESIZE_HANDLE"; - case LauncherLogProto.FAST_SCROLL_HANDLE: return "FAST_SCROLL_HANDLE"; default: return "UNKNOWN"; } } @@ -114,4 +104,22 @@ public class LoggerUtils { } return str + " id=" + t.pageIndex; } + + + public static LauncherLogProto.LauncherEvent initLauncherEvent( + int actionType, + int childTargetType, + int parentTargetType){ + LauncherLogProto.LauncherEvent event = new LauncherLogProto.LauncherEvent(); + + event.srcTarget = new LauncherLogProto.Target[2]; + event.srcTarget[0] = new LauncherLogProto.Target(); + event.srcTarget[0].type = childTargetType; + event.srcTarget[1] = new LauncherLogProto.Target(); + event.srcTarget[1].type = parentTargetType; + + event.action = new LauncherLogProto.Action(); + event.action.type = actionType; + return event; + } } |