From 55eb556a4b9b028a6a0cbe28400ae0582eb4ae04 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 15 May 2018 14:53:30 -0700
Subject: [PATCH] Dumping the excoded view hierarchy instead of the default
 activity dump

> Encoded hierarchy is smaller is size and has a lot more information about the views

Bug: 79861035
Change-Id: I84316b1b0031282b0579f3aaac22d8d8f00d8bcb
---
 quickstep/libs/sysui_shared.jar               | Bin 128240 -> 128738 bytes
 .../launcher3/uioverrides/UiFactory.java      |  34 ++++++++++++++++++
 src/com/android/launcher3/BaseActivity.java   |   9 +++++
 .../launcher3/uioverrides/UiFactory.java      |   8 +++++
 4 files changed, 51 insertions(+)

diff --git a/quickstep/libs/sysui_shared.jar b/quickstep/libs/sysui_shared.jar
index 95bb8bbed8d884f40a5bea787624a40537ff96d4..5e25fd8bf280b0370133ecfd6ebddf87cfa395c5 100644
GIT binary patch
delta 4451
zcmZWsc_5W(7r)OH_qxcwi|Zp<N?K@&bhQ{!MhoqsP>rQDQ>Mhlv|37Cd0H=(VWyPK
z)x51zQCT9S>=a=tA!f?*P2YLmS2w=#hvWU7bAHb`=Y8(^UEP0jUUhO5J=|o*Xt20k
zE=xb>sG>a^elLt<>*Zt@nj$cwX!RM`s2Hi?ydtD1na^I&0Te4HB5ToARV_TR7%514
z<r4@h5}44jN|J}FH%PK1T3v-ZB3vGK1Cyj)e*+1Z2u!*VTPH^{W&BFo#+lucXY1zR
zGe?0uamHB5UYmM30@MkSwIp#yEP0R^IG*K!6**-&h`il-SX72|B)SW^vIO)_a*%kt
z&*2gJ)Riu5u%gsYb`t)YsNrtxMEo_nlAg7Fio_SKZifXGNLw=f`*0F0$qu@rNlx*N
z*@y^X;&B1Cs6=BW8hiW35C`wjG6iD2lO~e@N#b!!`sC~&2Yj^(DN8t~!(@mfN*qWB
zbf$3R$WgvA0*PJvZ4!)UMhtgolc_92j&;g9Ob@L5>d)#VfSxZI!Lj^&5+F)lX@~Dt
zBOScH8qT=(*obb&H-<(HC6+~TWYAEq9iChR1Cgz?rJEm);7RsWU8I4|6gq{6qiPWk
zkE=x-$*$@{|8l8HJnJqIlrBYL(^#lV>KyEPO&XBA`s+5E*wjzQiG>-jlOzqkAdQQn
z#CABZ4jJLK4M<5+_W5_Z0aA!S5ou9nGAK-18jU2$A@|XUjXbKR52vq!%HK*@r3q<M
zYZXzkEUC%qFtWuelMok2H6caeWzWE6&%AUZOGEg#jCt1D4PLH2r|t-1H(c{s;<JFV
zp6EYGD|pV{R&Mzd|G8TGKeyu2oY3^Me||fwvZ?jQ0kLVOY-n1gyIEnleOdVI_M!e4
zS$AblJUqhVJ?;JGz+{a@FZaisKB1MehL@WkEbCdnq+2t<uf+0k%az1EXCIsq`n-R=
z&AYodW>sRg`GtpxKZxb_cl{9Oo927ntGOoGogLAr*tyQWKE=P|PT;Mb-#qeo=5A+k
zd74X{xIlM6|BvDovr5gB#X6^hk7?+Mx8%G?$kW<mnRGum{J_hA2Ym+rRrz6)a6+s5
zqvv6NBt#i~ST`e1+@fz>Aey#R{=vSet-=~V&CJk83jMbO?VUG=Tl>y=<}MQ%v@YSU
z$_=&SyVZZQ@LEyiF*wIVSMEmO(tFQ?b3Z<Ai&i~RmsC3ba!*CI?T>Yp+JDRQx$*xE
zn9yhMYo&PoWl6Glir*dg$2Nbfx?SwCjuvHvl#R(!IFgp6{uw=Z{qe7cgNCNg=i7qc
zY*;FcF6o{1;H1~)6Isbhb3%TN=PXZ8ej&do*Dp>^*|4)Vjq6olle}DUgUiEtnnyfv
zPeSYx2e0zH-{Unk7iV7lq!l=IwWZkSxbM(~m-6*p%QIUn<~4~sS2s2;I(?Vxx#x&d
ztd-_Ian>tc@ug45O>x=h-F-T8uTD`)VQyPPa$ALFhf42g8}4vX-ze#B;_QoQdgU8-
zAo*HFc|gRrnLC0y(k>Tyl)Eb!Z-1=tF|=Q&)aawwJl`gTpRU?7Q|Q@}u5Ie6>zL~}
zt|0P*@nhREg|~;B0(52<e(+dq6>GG-!Y5;MM$Mw6X8y?;73Co}CrxWU<Gi-Qb;IL9
z#p2aU4k<#;`Ryha>+2(9t~Ok*xtZ6o_;0lbww)T`7S>i_mrc3xm0Q-QR-PT}nmz4c
zk=pEd)dBH@5P99*tY3!YGS~LYo=iDd+{}(BJ2q*Xs#@nc2gi9wuOH3VOKD!lPq$XH
zys#;0qFTx7*x!<c&gp8#`cAtKT+F{|)$yQ8$iKL5zUD^ZCkJPPN570Y>Tj{%u;ND0
zDj(;LnR&}y7j(?dJ07-ZOh0Shx1YE-UcWKwD9rswsXw7e-`uK-8!@e7zSAVvnnLa-
zGv21SW2V2pnZGx3Hz(~y=(YJJ)0Qg;F1Wbq2u^Oltl~Mo-?S~Y#W5t+UE5z2Qm#}V
zv+(0<yO0YB_MwL>T^IH>7_3{H&U?D*TdftL3IFUE@SdQ&>b{Q2yQ%(bjf)+oZY|ii
zrqj6h(Dj2Np^S$chdXf9Ej~kr#meTeSYH(g7Fc$WHTGyh<EX<LXfM4Kq=>gRilkSG
z6tUDtn@7c9!Ar!Y+Q%Uu8je<H$Z*z6#G}M~G<|e5{}n_}FhN11X`9VZ_NYLr(E<(9
zNM{PoXhKb#gxWO7DmruP%PJ~qLF$y>Tog+psqXpcHrde_{;<U-TagYm=!`08mc-*U
z3x^uxiq6wPgoSEwLtdl&7!Y+T!X1q#1yX5C(9iTA7M|!kl1A<JLheldQON(i0`2>v
z&bHX51L;v!-YA0vfG{#g;?o_lNQ-<Ch!d?B!<7VWWa<_fI1UH$x4_wg0Axi6I%SQ7
zuWdrpN9RMd9jT3;2bB<n=&esVZ9|L6#-`t^$~z>FFTO<vxMc?#0I9&>o`DnJAp>e^
z7`jE2gzDObT!@TNppmKcBtiY-XpxCCv&O)og)?K&C!#b`Aox8}qlSJ)f-zrug*Yyr
z*@ed9ruXoYV-KPnQZOZmMW5*zf`k+jeWpNaY3-#zYi`r|!`FsG9Z5!&L{=%k6f~E9
zGs9PpgUfo5AvJgo)zY#%d@VTG@dNZ?ehF33)A>S#4SJCR<!~A8q+#Bn;aLK#N)22=
zt4T#)Ur}T)yrT2JqxrPfL0PsquMf%LcLbkx9r@4=z?I1$-$;l+(*b%^QXZ0(hi`EB
zbRn8a?DIk-0BWpLguWwoOA*>iY;6(RLhOQK<VWnKVg@%TVekVbfa~Po&Jwhr*d0&M
zHgZ(^6BI<OXDRxT*y2*Oo!B{L=qF-tl%W8^XZ#d29_*>7h<umCdgTm%+^`)gN5LdM
zumXh;TUP-eWUvb=;gbtCqY`+)DnDcJUC)^Kj%R2O!2_yLAmOd7V)ExbN1^2TkLOSa
zSeqBfpTyx8Oh4>urk?O>hzI}MYTyOyS;IUR)G&NgYZ;qT%jEIun7;Sap>V?2UkCkw
z-Br)n{(7hfc)}VOp7vq8qLF!i)QEz{>g8lD`nvD1QxjT2a!xfN1Ga@0Hf~4b$#)qo
z3@eX|2jL41amzP@dq8J|8}=U;f8Wfwe<JPzgAwlRMx?<dXPvk{#T-XABQ5rBqY-{s
zjT(I7*Z0rAug7MwG{&%4^H?K)CjVzdJnT#@I-Zqb`F1Jn>JHe|P9wuvH%&*x!!l*~
zm1bc65#Sfd{(pS9`G|PfvfPOtZiubHV*dXiwNYsaQ)(bL_g}fYtVZPi^X06kvU8nE
zG*~RVZ&<83qiVZnEsZz8&2N~gMYoWl&Xan$7?!pX8Fwe~Ja=Y1Hm%5%ZvC!dAMZMp
zQ!mG2*^i=6a$!PYv73_oyRDFa&5Z$Jt?Oc?_sp3VufcP8G2?-Su8(UPkRnZg?};W~
z7A7kKdWTW;`X17Fb^P`<QX^-4CQPx*h-Wrl-Nqao)dryQ3I?oeLuNGdukGh5o&lp5
zVzJyuG5f3}p=$}BupLsbt|HG4xTc*sq?3R_z62akG{lTVuIvENZzBVOf|w96kAUO+
z84&d2Ys;2@f~Rp4;~_eNqX+^yVq%wV8Q}pb(Zamp_oMR$+~wa(-3%q&k>P=z8zNv<
zC*T%3j_SxUgoy{y(U-pI_k?M}cD$q$O(2>x7VqB%2a%UT)8%FfTbhC9EDUJ$rQR7P
zO)}@}!kxVTbbsYZxCHrdCl`)7x!@-fIvt;Vhm^7HJETE&gB!>hyDD7jF(zOhfbbuY
zM<=Z6hzJ;nv=D>EZ8Noj-38cPMzP<ECLCTQ{kKlwbl=Nxg8Hd3w+lS_@4*wlkMV#E
z8j>j|5YRN1fM!w=WImk2j3Lfx7^5?c5k4~`e$3*f@q9wErVB_WBr>xVcOgFA2LV4E
zWk8v3=5|<h0~jM>K+sHWysw+NOecv)a6;<g<DqWmQ^D&2kLx+9M;8b5Fc&(Wcn)7+
zJRq}{q?kbh-pOP@5Lt5qZU(Vszq-PJL}D>WtR^o0z#LIS+^4Qe-Q!4(eJ_9xpity`
zgV37Lw;^=#&@5+|N&rknFk&VwR_P6VuNVG3g;do(NR7Eeo@e1Leb6DyKZ1Z(_X%i)
Tqw<gjuI)oAa>8P`SFHa5kE(kR

delta 3921
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
BMri;5

diff --git a/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java b/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
index 06099b9fa4..e6030d1261 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
@@ -24,7 +24,9 @@ import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.allapps.DiscoveryBounce.HOME_BOUNCE_SEEN;
 import static com.android.launcher3.allapps.DiscoveryBounce.SHELF_BOUNCE_SEEN;
 
+import android.app.Activity;
 import android.content.Context;
+import android.util.Base64;
 
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.DeviceProfile;
@@ -32,13 +34,19 @@ import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.LauncherStateManager;
 import com.android.launcher3.LauncherStateManager.StateHandler;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorPlaybackController;
 import com.android.launcher3.util.TouchController;
 import com.android.quickstep.OverviewInteractionState;
 import com.android.quickstep.RecentsModel;
 import com.android.quickstep.views.RecentsView;
+import com.android.systemui.shared.system.ActivityCompat;
 import com.android.systemui.shared.system.WindowManagerWrapper;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintWriter;
+import java.util.zip.Deflater;
+
 public class UiFactory {
 
     public static TouchController[] createTouchControllers(Launcher launcher) {
@@ -167,6 +175,32 @@ public class UiFactory {
         }
     }
 
+    public static boolean dumpActivity(Activity activity, PrintWriter writer) {
+        if (!Utilities.IS_DEBUG_DEVICE) {
+            return false;
+        }
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        if (!(new ActivityCompat(activity).encodeViewHierarchy(out))) {
+            return false;
+        }
+
+        Deflater deflater = new Deflater();
+        deflater.setInput(out.toByteArray());
+        deflater.finish();
+
+        out.reset();
+        byte[] buffer = new byte[1024];
+        while (!deflater.finished()) {
+            int count = deflater.deflate(buffer); // returns the generated code... index
+            out.write(buffer, 0, count);
+        }
+
+        writer.println("--encoded-view-dump-v0--");
+        writer.println(Base64.encodeToString(
+                out.toByteArray(), Base64.NO_WRAP | Base64.NO_PADDING));
+        return true;
+    }
+
     private static class LauncherTaskViewController extends TaskViewTouchController<Launcher> {
 
         public LauncherTaskViewController(Launcher activity) {
diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java
index 3e4589d1f5..4219667557 100644
--- a/src/com/android/launcher3/BaseActivity.java
+++ b/src/com/android/launcher3/BaseActivity.java
@@ -30,8 +30,10 @@ import android.view.View.AccessibilityDelegate;
 
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.logging.UserEventDispatcher;
+import com.android.launcher3.uioverrides.UiFactory;
 import com.android.launcher3.util.SystemUiController;
 
+import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.lang.annotation.Retention;
 import java.util.ArrayList;
@@ -224,6 +226,13 @@ public abstract class BaseActivity extends Activity {
         void onMultiWindowModeChanged(boolean isInMultiWindowMode);
     }
 
+    @Override
+    public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {
+        if (!UiFactory.dumpActivity(this, writer)) {
+            super.dump(prefix, fd, writer, args);
+        }
+    }
+
     protected void dumpMisc(PrintWriter writer) {
         writer.println(" deviceProfile isTransposed=" + getDeviceProfile().isVerticalBarLayout());
         writer.println(" orientation=" + getResources().getConfiguration().orientation);
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java b/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java
index b8cd0353e1..e9a47a77b8 100644
--- a/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java
+++ b/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java
@@ -16,12 +16,15 @@
 
 package com.android.launcher3.uioverrides;
 
+import android.app.Activity;
 import android.content.Context;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherStateManager.StateHandler;
 import com.android.launcher3.util.TouchController;
 
+import java.io.PrintWriter;
+
 public class UiFactory {
 
     public static TouchController[] createTouchControllers(Launcher launcher) {
@@ -47,4 +50,9 @@ public class UiFactory {
     public static void onLauncherStateOrResumeChanged(Launcher launcher) { }
 
     public static void onTrimMemory(Launcher launcher, int level) { }
+
+    public static boolean dumpActivity(Activity activity, PrintWriter writer) {
+        return false;
+    }
+
 }