aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-04 09:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor logging to capture Target hierarchy

Browse Source 
Instead of creating a fixed number of targets, we now pass an ArrayList
of targets to. Any class implementing
LogContainerProviders#fillInLogContainerData can setup it's own target
and add it to the ArrayList, It can also pass the ArrayList to other
LogContainerProvider to capture full Target hierarchy.

Bug: 147305863
Change-Id: I0063c692120fb9e1cff2d8902c5da972d0623418
This commit is contained in:
Samuel Fufa
2020-02-27 16:59:19 -08:00
parent 9099dfcfb7
commit a579ddc9c8
18 changed files with 241 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
View File

@@ -24,6 +24,8 @@ import static android.stats.launcher.nano.Launcher.LAUNCH_APP;
import static android.stats.launcher.nano.Launcher.LAUNCH_TASK;
import static android.stats.launcher.nano.Launcher.OVERVIEW;
import static com.android.launcher3.logging.UserEventDispatcher.makeTargetsList;
import android.content.Context;
import android.content.Intent;
import android.os.UserHandle;
@@ -47,6 +49,8 @@ import com.android.systemui.shared.system.SysUiStatsLog;
import com.google.protobuf.nano.MessageNano;
import java.util.ArrayList;
/**
* This method calls the StatsLog hidden method until they are made available public.
*
@@ -61,7 +65,8 @@ public class StatsLogCompatManager extends StatsLogManager {
private static final String TAG = "StatsLogCompatManager";
private static final boolean DEBUG = false;
public StatsLogCompatManager(Context context) { }
public StatsLogCompatManager(Context context) {
}
@Override
public void logAppLaunch(View v, Intent intent, @Nullable UserHandle userHandle) {
@@ -120,14 +125,17 @@ public class StatsLogCompatManager extends StatsLogManager {
return false;
}
ItemInfo itemInfo = (ItemInfo) v.getTag();
Target child = new Target();
Target parent = new Target();
provider.fillInLogContainerData(v, itemInfo, child, parent);
extension.srcTarget[0] = new LauncherTarget();
extension.srcTarget[1] = new LauncherTarget();
copy(child, extension.srcTarget[0]);
copy(parent, extension.srcTarget[1]);
ArrayList<Target> targets = makeTargetsList(child);
targets.add(child);
provider.fillInLogContainerData((ItemInfo) v.getTag(), child, targets);
int maxDepth = Math.min(SUPPORTED_TARGET_DEPTH, targets.size());
extension.srcTarget = new LauncherTarget[maxDepth];
for (int i = 0; i < maxDepth; i++) {
extension.srcTarget[i] = new LauncherTarget();
copy(targets.get(i), extension.srcTarget[i]);
}
return true;
}
@@ -238,10 +246,10 @@ public class StatsLogCompatManager extends StatsLogManager {
@Override
public void verify() {
if(!(StatsLogUtils.LAUNCHER_STATE_ALLAPPS == ALLAPPS &&
StatsLogUtils.LAUNCHER_STATE_BACKGROUND == BACKGROUND &&
StatsLogUtils.LAUNCHER_STATE_OVERVIEW == OVERVIEW &&
StatsLogUtils.LAUNCHER_STATE_HOME == HOME)) {
if (!(StatsLogUtils.LAUNCHER_STATE_ALLAPPS == ALLAPPS
&& StatsLogUtils.LAUNCHER_STATE_BACKGROUND == BACKGROUND
&& StatsLogUtils.LAUNCHER_STATE_OVERVIEW == OVERVIEW
&& StatsLogUtils.LAUNCHER_STATE_HOME == HOME)) {
throw new IllegalStateException(
"StatsLogUtil constants doesn't match enums in launcher.proto");
}