From fd94cd54987931499e7252d03a5ecf6e1056dba0 Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Thu, 25 Apr 2019 11:20:42 -0700 Subject: [PATCH] Add logging for Task Icon interaction Bug: 129279637 Change-Id: I135bad16015129b3b60bb13e86783d623e504b1b --- protos/launcher_log.proto | 2 ++ .../src/com/android/quickstep/views/TaskView.java | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/protos/launcher_log.proto b/protos/launcher_log.proto index 4974dcbdc9..02c6b0f419 100644 --- a/protos/launcher_log.proto +++ b/protos/launcher_log.proto @@ -71,6 +71,7 @@ enum ItemType { NOTIFICATION = 8; TASK = 9; // Each page of Recents UI (QuickStep) WEB_APP = 10; + TASK_ICON = 11; } // Used to define what type of container a Target would represent. @@ -115,6 +116,7 @@ enum ControlType { REMOTE_ACTION_SHORTCUT = 17; APP_USAGE_SETTINGS = 18; BACK_GESTURE = 19; + UNDO = 20; } enum TipType { diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java index 05fe2d0d1e..848c2140fd 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java @@ -49,6 +49,8 @@ import com.android.launcher3.BaseDraggingActivity; import com.android.launcher3.R; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.anim.Interpolators; +import com.android.launcher3.logging.UserEventDispatcher; +import com.android.launcher3.userevent.nano.LauncherLogProto; import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction; import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch; import com.android.launcher3.util.PendingAnimation; @@ -366,9 +368,11 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { } } - private boolean showTaskMenu() { + private boolean showTaskMenu(int action) { getRecentsView().snapToPage(getRecentsView().indexOfChild(this)); mMenuView = TaskMenuView.showForTask(this); + UserEventDispatcher.newInstance(getContext()).logActionOnItem(action, Direction.NONE, + LauncherLogProto.ItemType.TASK_ICON); if (mMenuView != null) { mMenuView.addOnAttachStateChangeListener(mTaskMenuStateListener); } @@ -378,10 +382,10 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { private void setIcon(Drawable icon) { if (icon != null) { mIconView.setDrawable(icon); - mIconView.setOnClickListener(v -> showTaskMenu()); + mIconView.setOnClickListener(v -> showTaskMenu(Touch.TAP)); mIconView.setOnLongClickListener(v -> { requestDisallowInterceptTouchEvent(true); - return showTaskMenu(); + return showTaskMenu(Touch.LONGPRESS); }); } else { mIconView.setDrawable(null);