From dbd01bf6f9db1159f6e43a89b326b5169ea0b6df Mon Sep 17 00:00:00 2001 From: Holly Sun Date: Wed, 21 Sep 2022 16:34:14 -0700 Subject: [PATCH] Log a-z apps count. Test: manual Bug: 247432075 Change-Id: I9538a75bc3cb3d1e8e9089fc5e27d5d770cafb62 --- .../quickstep/logging/StatsLogCompatManager.java | 10 +++++++++- .../launcher3/allapps/BaseAllAppsContainerView.java | 5 +++++ .../android/launcher3/logging/StatsLogManager.java | 13 ++++++++++++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java index a9ff0fb07f..79c578df53 100644 --- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java +++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java @@ -217,6 +217,7 @@ public class StatsLogCompatManager extends StatsLogManager { private Optional mEditText = Optional.empty(); private SliceItem mSliceItem; private LauncherAtom.Slice mSlice; + private Optional mCardinality = Optional.empty(); StatsCompatLogger(Context context, ActivityContext activityContext) { mContext = context; @@ -303,6 +304,12 @@ public class StatsLogCompatManager extends StatsLogManager { return this; } + @Override + public StatsLogger withCardinality(int cardinality) { + this.mCardinality = Optional.of(cardinality); + return this; + } + @Override public void log(EventEnum event) { if (!Utilities.ATLEAST_R) { @@ -421,6 +428,7 @@ public class StatsLogCompatManager extends StatsLogManager { if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { return; } + int cardinality = mCardinality.orElseGet(() -> getCardinality(atomInfo)); SysUiStatsLog.write( SysUiStatsLog.LAUNCHER_EVENT, SysUiStatsLog.LAUNCHER_UICHANGED__ACTION__DEFAULT_ACTION /* deprecated */, @@ -446,7 +454,7 @@ public class StatsLogCompatManager extends StatsLogManager { atomInfo.getFolderIcon().getFromLabelState().getNumber() /* fromState */, atomInfo.getFolderIcon().getToLabelState().getNumber() /* toState */, atomInfo.getFolderIcon().getLabelInfo() /* edittext */, - getCardinality(atomInfo) /* cardinality */, + cardinality /* cardinality */, getFeatures(atomInfo) /* features */, getSearchAttributes(atomInfo) /* searchAttributes */, getAttributes(atomInfo) /* attributes */ diff --git a/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java b/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java index 70c1e18301..11df81ae12 100644 --- a/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java @@ -15,6 +15,7 @@ */ package com.android.launcher3.allapps; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_COUNT; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_TAP_ON_PERSONAL_TAB; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_TAP_ON_WORK_TAB; @@ -244,6 +245,10 @@ public abstract class BaseAllAppsContainerView