From a05860421f22e6111a24cddbfaed812ecf5b8250 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 1 May 2018 16:46:59 -0700
Subject: [PATCH] Log OVERVIEW_ACTIVITY via MetricsLogger in quickstep Bug:
 77920179

Change-Id: Id4c7dc3d535c7a8009d340183e640b04ab07408a
---
 quickstep/libs/sysui_shared.jar               | Bin 124099 -> 124254 bytes
 quickstep/res/values/config.xml               |   2 +
 .../logging/UserEventDispatcherExtension.java |  35 ++++++++++++++++++
 .../logging/UserEventDispatcher.java          |   2 +-
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java

diff --git a/quickstep/libs/sysui_shared.jar b/quickstep/libs/sysui_shared.jar
index 70e545f4fb35f8a9ea93692000b15fbdf1f72c61..120d6f98df81065879162bd31f5f177920634da5 100644
GIT binary patch
delta 3732
zcmZWs30O{P8$M5^ec!YRr3j7EX0I;(iWV`((!^9$A~DiLi)4vxqrUV`{r$3Jix!>X
zWLlI;`YKvzS6>Upa$$@t5&wJMb6UQcuIszL`?{a|S>ES7?{mJ&s$@EaGD@DVl2V$K
ztgI|$e)vp+(i}<lYe_Wwbxmjt>^JHj59Wz#+JYFlF(|DN6zN40{nErT;U{9DW8{{}
zu!La0kuCaM2uifJ+SSp{asnlNb<|meopm(|h!%0qa<r2E4nolTjb0HSI&9J^&RMhv
z%msA<WkK#FO_XyBr0Gef{&FPsS9!1z_ykEKr4rDlAI-Q!DxxpgG92)kpC-==>2J>d
zV+aUzk06Y|t&;WB5?FXkA+Ot@OgpT8!6p9A>-tF5Y+~e42D<bd?^lW>DccEBk43N=
z9Uc@Z!Lo^|b7_m<?OH4rSUj*no>d@^PL_iv{V`UBi)R@?9M$Q?`y{w(JPs{aARdA4
za|NPUDM63mHOawBlPf_B&AS5%^u&`LQY@X9S}IB8zF)Znf^F#vwDPG5T;Z1K(&X49
z`3Ea;{$uAaaoJ{FS;D!0bDm3=WH0Buv~u@qkeuwJz~@py#Z{nA|5@fs#I##wBoX4M
z_Gr2gcWP`^g6wdWiE6U6sNS74fwp+?i~xaUx{W|oFOObVgBl&&9RDv?o_1`@BP>4x
zvO{_~dcmV?H4>kF@;JW0XFwWR)Pf$p==HDMQJUTra3R0*!jExaGX3VmtYL!o8TiW8
z?)z1PG>+{Emf^|054wy{0=9DEAzHBx)4z@ZCviH8rKib49ibUKZ3d*l%s4d|OSr^T
zb9ABs3{hP@$T0C55G79AH(=UJ8^)0`c(n;rqX$0X!f}mQ7&{Kua;fl)9TFD|vVvkG
z2p}gL%FApwh3jHMCd>>z69zv7bLRAPP#{CeWIIAD7yR%dDBva%BWotg37!)J!c%9B
zI-BsJZ!Cs*PJ-R6kxMh^GYPIRca#ou8jQ9Fn2>^)1<PPBhssuf2k~VzSAshi1-H%|
zy;%W<OwK9@Avc}D^VZK<NnST!(2GgjvQ)!Swenm0#eKayRka))GWRCS8%)vDI2v#J
zoA>gHDVJmI0&a!~6JKQCY`5)RpE6}q>PPsZxm&&WWq)1Wp-Wqz1Ox=`{yV*BaA2@;
zEcGJ)wdjU|$`3N(-hIo)m8&LSWrAxD+Z5YeX}UT)|Aok~%;ob<i))I4KSHiAs>zL6
zp%T{qG*fqT>$~$ajaJTkYdj}8^Kp7+r%!(F!<MLrvbJ4?(aYPF^-A9>ODgEZZT2#W
zo7N~==G?cq$1bkH_;SXsniDzGZFS^r9%(9`3%gu?#3OQPd3)51vo$-{9-O!7&FZ#U
zuG%%lZaRji8jyjh)9-T|mcHLL-J_>*>gGQNV~*=Lc=en~@KVcEZ}}uS(eCW|-i2{~
zCNAGsWS^`S?eI5hymmgiHCTSr_Qs^68P6WRZi~3#Dw7j7S-HY0sCsgYRm9^x;Wzh%
z#T~Qn%<5T^?h>QB`P@_5hn|+?`)1&_gPES%Uz6104<5-c_Z<A3{?u2;*f86#Ep?4b
zXw$SGLu1C-=@@?Lns0TqHEi%uV@Xz#q}uXLkGtNR!oqh+u?Batmb|@SaoDmhvO3S?
zZP5BWWcGK`DeH5uSNH4Od>+^retg--Lp`5=kJ$TC_N9KB6Id-ut<XALxK711Uis~_
zsWUq@o(t>4a|fW}nQ_wY*p7FnkAiy8M2(``ihe~YD`GBH)CT0wQDS-@Y1)NKT}-!I
z8m(ZK({bfXRjAde{_F%~9P`TUjO3t5UT*C?=Z&A-I(+Oy;<r^l75&+tcAaUz|Ks`M
z>!BY`mDR3jiE1lyP-wmSzpx|PX#?QtDkD2F<-Fr635t>$Ls4SyJU5E_6KtGsf<zne
zu*a>3sbn|>-<-`EOz|U)M|B+;b3`u2><+B$4g$oDe&iN#BMXYXpQj^0?nWqRb2E-j
zw#?EU(9GRIvv6=GK7v_S@GXsi?SvOxuqBS#=u;<XGa=Dn$z3_T3KycSU7(IW#K04F
zJ2IF$N!AL&>&Tk9dH|BRRQO_9qst=DV-gO6J;$*Z@J2iwCk{-)F_0l|Q0BkM;7Bsy
zij(8<{hXQt-DJD7>jN{g=y4A|<GQoZ!1W{0-JJ2s06%h0L@xG(J}_XEGhyRMXPB%k
z*v?hQmcy*fgYn!uduIX6BHNuV0DA)Z3&4W_r$PuJfGNbW@EMU&5v(WRP!VtXRK%M$
z6!RuwF&rS8<+orf0p+(~GXXP8Ae4YhCGax=2Bi>AKyoSg6Y#YZejy<IHjtk@=)-M3
z*Tym)w3b0I(YTbu76S6iA&>y03iyeD{S|z`mleEe<sIIu;toU-&B999L_lsOA7{c{
z*hUz^UA{1-D%e1n9aa2EyQ=sKR||QsyFxz2%xa!FTg^vSso_CX4e$Q6hHuN7T8JQ#
zn`-%!uDr*Crh9yaEAI0F%ZGq<9nWOc@m*D~2R{-gyq-VclOga!1J9HX0joy7hZ&8$
zN#g+z_6~u+9`H4<dk8@!vhX2((Xj(y)x?9eCjQ9M&AeuNGtYE1!)_v8+X8zC5VgQA
z0=!%KnuV>fQ5gqx8`%NKp$)u=D!mQ#C2H2A?glVH_uD}O9as;lXk$GnPGEg{FUzP(
z0YwS%XJ}P$3&YWWl+(Zl&_=u4f%}<wtQ`lv6)<c!A)yQp{^A!cNm0MaP}Bl`>u_Ha
zHgQtCQYI5AEmyF%MT(+~6ew!3m{cx=ljdvzQ&ii`Cv3yJNMd#9ut^muhk`P4Z{_Wa
zA7T5&9h}{#3sjKz4j7A4N_cw-YiGho*@MIJFHqJ_>hb^F?LPx=&y#q2{zt4Hh#cjF
zgDRoQW>6<i2JTO0kHt<d*vUoA>0I<EC%o;9$fGdq!bMo@88(>{_5{m@#16A6$T$|S
zLiXq+i}#0F!T|hmEN~_}u`JSYoD<%Tnj?D4E(?7VtbdC?^TqV_2RS`npQa@AHS@FO
zp7<#|lcy*LF{y7nC%vDHyJ#2>(j%>Q=*IPqKR#^NMV)x#s(8ABgeEoopBB2t%FNKP
z%yRla6mB}>4H8RaDQb-tMLCLP-;y%yrh|_4@a?v5xU80s5A_%~!d^_Dc9zrk^}rO;
zQ<YwvyflMj12ga$RJ!<f{_Or`juRfz06e7PXZ}8u)8p-~h3@r&Ch3uV-`pAVagUD6
k{d1^gvWNBhBa^zU52wz}<4pL?pog;hKvi0*5LZt9AD_;LIsgCw

delta 3389
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
Q^iq#LLN_9pJ{`&b03j=W*#H0l

diff --git a/quickstep/res/values/config.xml b/quickstep/res/values/config.xml
index 37929b65e2..7673f69940 100644
--- a/quickstep/res/values/config.xml
+++ b/quickstep/res/values/config.xml
@@ -17,4 +17,6 @@
     <string name="task_overlay_factory_class" translatable="false"></string>
 
     <string name="overview_callbacks_class" translatable="false"></string>
+
+    <string name="user_event_dispatcher_class" translatable="false">com.google.quickstep.logging.UserEventDispatcherExtension</string>
 </resources>
diff --git a/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java b/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java
new file mode 100644
index 0000000000..d4cdd3556b
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.quickstep.logging;
+
+import com.android.launcher3.logging.UserEventDispatcher;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
+import com.android.systemui.shared.system.MetricsLoggerCompat;
+
+/**
+ * This class handles AOSP MetricsLogger function calls.
+ */
+public class UserEventDispatcherExtension extends UserEventDispatcher {
+
+    public void logStateChangeAction(int action, int dir, int srcChildTargetType,
+                                     int srcParentContainerType, int dstContainerType,
+                                     int pageIndex) {
+        new MetricsLoggerCompat().visibility(MetricsLoggerCompat.OVERVIEW_ACTIVITY,
+                dstContainerType == LauncherLogProto.ContainerType.TASKSWITCHER);
+        super.logStateChangeAction(action, dir, srcChildTargetType, srcParentContainerType,
+                dstContainerType, pageIndex);
+    }
+}
diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java
index bf870cca01..2c1eb32872 100644
--- a/src/com/android/launcher3/logging/UserEventDispatcher.java
+++ b/src/com/android/launcher3/logging/UserEventDispatcher.java
@@ -285,7 +285,7 @@ public class UserEventDispatcher {
      * Used primarily for swipe up and down when state changes when swipe up happens from the
      * navbar bezel, the {@param srcChildContainerType} is NAVBAR and
      * {@param srcParentContainerType} is either one of the two
-     * (1) WORKSPACE: if the launcher the foreground activity
+     * (1) WORKSPACE: if the launcher is the foreground activity
      * (2) APP: if another app was the foreground activity
      */
     public void logStateChangeAction(int action, int dir, int srcChildTargetType,