From 018eec68997342ca87e4ea607ab292adb12d7a34 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Wed, 9 May 2018 16:18:58 -0700
Subject: [PATCH] Add logging for Onboarding Bug: 73784423

* Discovery bounce, homescreen, hotseat
UserEvent: action:TIP
UserEvent:  Source child:HOTSEAT id=0 BOUNCE

* Discovery bounce, overview, prediction
UserEvent: action:TIP
UserEvent:  Source child:PREDICTION BOUNCE

* Swipe up from navbar text (visibility, cancel target)
UserEvent: action:TIP
UserEvent:  Source child:TIP SWIPE_UP_TEXT

UserEvent: action:TAP
UserEvent:  Source child:CANCEL_TARGET SWIPE_UP_TEXT

* Quickscrub text (visibility, cancel target)
UserEvent: action:TIP
UserEvent:  Source child:TIP QUICK_SCRUB_TEXT

UserEvent: action:TAP
UserEvent:  Source child:CANCEL_TARGET QUICK_SCRUB_TEXT

* Prediction apps text (visibility, cancel target)
UserEvent: action:TAP
UserEvent:  Source child:TIP PREDICTION_TEXT

UserEvent: action:TAP
UserEvent:  Source child:CANCEL_TARGET PREDICTION_TEXT

Change-Id: I94710b5ed3d00e3599985b154eb660af4a958288
---
 protos/launcher_log.proto                     |  15 ++++-
 quickstep/libs/sysui_shared.jar               | Bin 128394 -> 128240 bytes
 .../quickstep/OverviewCommandHelper.java      |  13 +++++
 .../quickstep/TouchInteractionService.java    |   5 ++
 .../logging/UserEventDispatcherExtension.java |  52 +++++++++++++++++-
 .../launcher3/allapps/DiscoveryBounce.java    |   4 ++
 .../launcher3/logging/LoggerUtils.java        |  28 ++++++++--
 .../logging/UserEventDispatcher.java          |  22 +++++++-
 8 files changed, 130 insertions(+), 9 deletions(-)

diff --git a/protos/launcher_log.proto b/protos/launcher_log.proto
index 179f21d804..cd404d6d5f 100644
--- a/protos/launcher_log.proto
+++ b/protos/launcher_log.proto
@@ -55,6 +55,7 @@ message Target {
   optional int32 span_y = 14 [default = 1];// Used for ItemType.WIDGET
   optional int32 predictedRank = 15;
   optional TargetExtension extension = 16;
+  optional TipType tip_type = 17;
 }
 
 // Used to define what type of item a Target would represent.
@@ -88,6 +89,7 @@ enum ContainerType {
   NAVBAR = 11;
   TASKSWITCHER = 12; // Recents UI Container (QuickStep)
   APP = 13; // Foreground activity is another app (QuickStep)
+  TIP = 14; // Onboarding texts (QuickStep)
 }
 
 // Used to define what type of control a Target would represent.
@@ -109,14 +111,24 @@ enum ControlType {
   CANCEL_TARGET = 14;
 }
 
+enum TipType {
+  DEFAULT_NONE = 0;
+  BOUNCE = 1;
+  SWIPE_UP_TEXT = 2;
+  QUICK_SCRUB_TEXT = 3;
+  PREDICTION_TEXT = 4;
+}
+
 // Used to define the action component of the LauncherEvent.
 message Action {
   enum Type {
     TOUCH = 0;
     AUTOMATED = 1;
     COMMAND = 2;
+    TIP = 3;
     // SOFT_KEYBOARD, HARD_KEYBOARD, ASSIST
   }
+
   enum Touch {
     TAP = 0;
     LONGPRESS = 1;
@@ -125,7 +137,8 @@ message Action {
     FLING = 4;
     PINCH = 5;
   }
- enum Direction {
+
+  enum Direction {
     NONE = 0;
     UP = 1;
     DOWN = 2;
diff --git a/quickstep/libs/sysui_shared.jar b/quickstep/libs/sysui_shared.jar
index b343cc2058e876e79f468a5d285e154acfe726f0..95bb8bbed8d884f40a5bea787624a40537ff96d4 100644
GIT binary patch
delta 9844
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
MiPOY3fvsWw53LC)n*aa+

delta 9810
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
AJpcdz

diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index c1462460b2..81a73fc653 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -48,8 +48,10 @@ import android.view.ViewConfiguration;
 
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.BaseDraggingActivity;
+import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.MainThreadExecutor;
 import com.android.launcher3.anim.AnimationSuccessListener;
+import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.quickstep.ActivityControlHelper.ActivityInitListener;
 import com.android.quickstep.ActivityControlHelper.AnimationFactory;
 import com.android.quickstep.ActivityControlHelper.FallbackActivityControllerHelper;
@@ -189,6 +191,17 @@ public class OverviewCommandHelper {
         mMainThreadExecutor.execute(new ShowRecentsCommand());
     }
 
+    public void onTip(int actionType, int viewType) {
+        mMainThreadExecutor.execute(new Runnable() {
+            @Override
+            public void run() {
+                UserEventDispatcher.newInstance(mContext,
+                        new InvariantDeviceProfile(mContext).getDeviceProfile(mContext))
+                        .logActionTip(actionType, viewType);
+            }
+        });
+    }
+
     public ActivityControlHelper getActivityControlHelper() {
         return mActivityControlHelper;
     }
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 7496b47827..bd05b6d7bf 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -147,6 +147,11 @@ public class TouchInteractionService extends Service {
             TraceHelper.endSection("SysUiBinder", "onQuickStep");
 
         }
+
+        @Override
+        public void onTip(int actionType, int viewType) {
+            mOverviewCommandHelper.onTip(actionType, viewType);
+        }
     };
 
     private final TouchConsumer mNoOpTouchConsumer = (ev) -> {};
diff --git a/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java b/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java
index d4cdd3556b..04153cc99e 100644
--- a/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java
+++ b/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java
@@ -15,15 +15,32 @@
  */
 package com.android.quickstep.logging;
 
+import android.util.Log;
+
+import static com.android.launcher3.logging.LoggerUtils.newAction;
+import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
+import static com.android.launcher3.logging.LoggerUtils.newLauncherEvent;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.ControlType.CANCEL_TARGET;
+import static com.android.systemui.shared.system.LauncherEventUtil.VISIBLE;
+import static com.android.systemui.shared.system.LauncherEventUtil.DISMISS;
+import static com.android.systemui.shared.system.LauncherEventUtil.RECENTS_QUICK_SCRUB_ONBOARDING_TIP;
+import static com.android.systemui.shared.system.LauncherEventUtil.RECENTS_SWIPE_UP_ONBOARDING_TIP;
+
 import com.android.launcher3.logging.UserEventDispatcher;
+import com.android.launcher3.model.nano.LauncherDumpProto;
+import com.android.launcher3.userevent.nano.LauncherLogExtensions;
 import com.android.launcher3.userevent.nano.LauncherLogProto;
+import com.android.systemui.shared.system.LauncherEventUtil;
 import com.android.systemui.shared.system.MetricsLoggerCompat;
 
 /**
- * This class handles AOSP MetricsLogger function calls.
+ * This class handles AOSP MetricsLogger function calls and logging around
+ * quickstep interactions.
  */
 public class UserEventDispatcherExtension extends UserEventDispatcher {
 
+    private static final String TAG = "UserEventDispatcher";
+
     public void logStateChangeAction(int action, int dir, int srcChildTargetType,
                                      int srcParentContainerType, int dstContainerType,
                                      int pageIndex) {
@@ -32,4 +49,37 @@ public class UserEventDispatcherExtension extends UserEventDispatcher {
         super.logStateChangeAction(action, dir, srcChildTargetType, srcParentContainerType,
                 dstContainerType, pageIndex);
     }
+
+    public void logActionTip(int actionType, int viewType) {
+        LauncherLogProto.Action action = new LauncherLogProto.Action();
+        LauncherLogProto.Target target = new LauncherLogProto.Target();
+        switch(actionType) {
+            case VISIBLE:
+                action.type = LauncherLogProto.Action.Type.TIP;
+                target.type = LauncherLogProto.Target.Type.CONTAINER;
+                target.containerType = LauncherLogProto.ContainerType.TIP;
+                break;
+            case DISMISS:
+                action.type = LauncherLogProto.Action.Type.TOUCH;
+                action.touch = LauncherLogProto.Action.Touch.TAP;
+                target.type = LauncherLogProto.Target.Type.CONTROL;
+                target.controlType = CANCEL_TARGET;
+                break;
+            default:
+                Log.e(TAG, "Unexpected action type = " + actionType);
+        }
+
+        switch(viewType) {
+            case RECENTS_QUICK_SCRUB_ONBOARDING_TIP:
+                target.tipType = LauncherLogProto.TipType.QUICK_SCRUB_TEXT;
+                break;
+            case RECENTS_SWIPE_UP_ONBOARDING_TIP:
+                target.tipType = LauncherLogProto.TipType.SWIPE_UP_TEXT;
+                break;
+            default:
+                Log.e(TAG, "Unexpected viewType = " + viewType);
+        }
+        LauncherLogProto.LauncherEvent event = newLauncherEvent(action, target);
+        dispatchUserEvent(event, null);
+    }
 }
diff --git a/src/com/android/launcher3/allapps/DiscoveryBounce.java b/src/com/android/launcher3/allapps/DiscoveryBounce.java
index e8c5f15df9..deaf8d3c1d 100644
--- a/src/com/android/launcher3/allapps/DiscoveryBounce.java
+++ b/src/com/android/launcher3/allapps/DiscoveryBounce.java
@@ -18,6 +18,8 @@ package com.android.launcher3.allapps;
 
 import static com.android.launcher3.LauncherState.NORMAL;
 import static com.android.launcher3.LauncherState.OVERVIEW;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType.HOTSEAT;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType.PREDICTION;
 
 import android.animation.Animator;
 import android.animation.AnimatorInflater;
@@ -127,6 +129,7 @@ public class DiscoveryBounce extends AbstractFloatingView {
                 AnimatorInflater.loadAnimator(launcher, R.animator.discovery_bounce));
         view.mIsOpen = true;
         launcher.getDragLayer().addView(view);
+        launcher.getUserEventDispatcher().logActionBounceTip(HOTSEAT);
     }
 
     public static void showForOverviewIfNeeded(Launcher launcher) {
@@ -173,5 +176,6 @@ public class DiscoveryBounce extends AbstractFloatingView {
         DiscoveryBounce view = new DiscoveryBounce(launcher, animator);
         view.mIsOpen = true;
         launcher.getDragLayer().addView(view);
+        launcher.getUserEventDispatcher().logActionBounceTip(PREDICTION);
     }
 }
diff --git a/src/com/android/launcher3/logging/LoggerUtils.java b/src/com/android/launcher3/logging/LoggerUtils.java
index 9d97cb9c0f..442691f0dd 100644
--- a/src/com/android/launcher3/logging/LoggerUtils.java
+++ b/src/com/android/launcher3/logging/LoggerUtils.java
@@ -31,6 +31,7 @@ import com.android.launcher3.userevent.nano.LauncherLogProto.ControlType;
 import com.android.launcher3.userevent.nano.LauncherLogProto.ItemType;
 import com.android.launcher3.userevent.nano.LauncherLogProto.LauncherEvent;
 import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
+import com.android.launcher3.userevent.nano.LauncherLogProto.TipType;
 import com.android.launcher3.util.InstantAppResolver;
 
 import java.lang.reflect.Field;
@@ -76,7 +77,7 @@ public class LoggerUtils {
                 }
                 return str;
             case Action.Type.COMMAND: return getFieldName(action.command, Action.Command.class);
-            default: return UNKNOWN;
+            default: return getFieldName(action.type, Action.Type.class);
         }
     }
 
@@ -84,23 +85,32 @@ public class LoggerUtils {
         if (t == null){
             return "";
         }
+        String str = "";
         switch (t.type) {
             case Target.Type.ITEM:
-                return getItemStr(t);
+                str = getItemStr(t);
+                break;
             case Target.Type.CONTROL:
-                return getFieldName(t.controlType, ControlType.class);
+                str = getFieldName(t.controlType, ControlType.class);
+                break;
             case Target.Type.CONTAINER:
-                String str = getFieldName(t.containerType, ContainerType.class);
+                str = getFieldName(t.containerType, ContainerType.class);
                 if (t.containerType == ContainerType.WORKSPACE ||
                         t.containerType == ContainerType.HOTSEAT) {
                     str += " id=" + t.pageIndex;
                 } else if (t.containerType == ContainerType.FOLDER) {
                     str += " grid(" + t.gridX + "," + t.gridY+ ")";
                 }
-                return str;
+                break;
             default:
-                return "UNKNOWN TARGET TYPE";
+                str += "UNKNOWN TARGET TYPE";
         }
+
+        if (t.tipType != TipType.DEFAULT_NONE) {
+            str += " " + getFieldName(t.tipType, TipType.class);
+        }
+
+        return str;
     }
 
     private static String getItemStr(Target t) {
@@ -186,6 +196,12 @@ public class LoggerUtils {
         return t;
     }
 
+    public static Target newControlTarget(int controlType) {
+        Target t = newTarget(Target.Type.CONTROL);
+        t.controlType = controlType;
+        return t;
+    }
+
     public static Target newContainerTarget(int containerType) {
         Target t = newTarget(Target.Type.CONTAINER);
         t.containerType = containerType;
diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java
index 2c1eb32872..07e1315aa4 100644
--- a/src/com/android/launcher3/logging/UserEventDispatcher.java
+++ b/src/com/android/launcher3/logging/UserEventDispatcher.java
@@ -16,8 +16,10 @@
 
 package com.android.launcher3.logging;
 
+import static com.android.launcher3.logging.LoggerUtils.newAction;
 import static com.android.launcher3.logging.LoggerUtils.newCommandAction;
 import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
+import static com.android.launcher3.logging.LoggerUtils.newControlTarget;
 import static com.android.launcher3.logging.LoggerUtils.newDropTarget;
 import static com.android.launcher3.logging.LoggerUtils.newItemTarget;
 import static com.android.launcher3.logging.LoggerUtils.newLauncherEvent;
@@ -163,6 +165,8 @@ public class UserEventDispatcher {
         dispatchUserEvent(event, intent);
     }
 
+    public void logActionTip(int actionType, int viewType) { }
+
     public void logTaskLaunchOrDismiss(int action, int direction, ComponentKey componentKey) {
         LauncherEvent event = newLauncherEvent(newTouchAction(action), // TAP or SWIPE or FLING
                 newTarget(Target.Type.ITEM));
@@ -243,6 +247,15 @@ public class UserEventDispatcher {
         logActionOnControl(action, controlType, controlInContainer, -1);
     }
 
+    public void logActionOnControl(int action, int controlType, int parentContainer,
+                                   int grandParentContainer){
+        LauncherEvent event = newLauncherEvent(newTouchAction(action),
+                newControlTarget(controlType),
+                newContainerTarget(parentContainer),
+                newContainerTarget(grandParentContainer));
+        dispatchUserEvent(event, null);
+    }
+
     public void logActionOnControl(int action, int controlType, @Nullable View controlInContainer,
                                    int parentContainerType) {
         final LauncherEvent event = (controlInContainer == null && parentContainerType < 0)
@@ -269,6 +282,13 @@ public class UserEventDispatcher {
         dispatchUserEvent(event, null);
     }
 
+    public void logActionBounceTip(int containerType) {
+        LauncherEvent event = newLauncherEvent(newAction(Action.Type.TIP),
+                newContainerTarget(containerType));
+        event.srcTarget[0].tipType = LauncherLogProto.TipType.BOUNCE;
+        dispatchUserEvent(event, null);
+    }
+
     public void logActionOnContainer(int action, int dir, int containerType) {
         logActionOnContainer(action, dir, containerType, 0);
     }
@@ -393,7 +413,7 @@ public class UserEventDispatcher {
         if (!IS_VERBOSE) {
             return;
         }
-        String log = "action:" + LoggerUtils.getActionStr(ev.action);
+        String log = "\n\naction:" + LoggerUtils.getActionStr(ev.action);
         if (ev.srcTarget != null && ev.srcTarget.length > 0) {
             log += "\n Source " + getTargetsStr(ev.srcTarget);
         }