From 611eaa9edffee22ad49c8a9caa9f48d53485534a Mon Sep 17 00:00:00 2001 From: Chris Wren Date: Tue, 9 Jun 2015 14:42:26 -0400 Subject: [PATCH 1/2] induct a bunch of new logging categories. Bug: 21114836 Change-Id: I978a0af2cf86e836091ef9219194e4b587a5534e --- .../internal/logging/MetricsConstants.java | 21 +++++++++++++++++++ .../internal/logging/MetricsLogger.java | 1 - 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/core/java/com/android/internal/logging/MetricsConstants.java b/core/java/com/android/internal/logging/MetricsConstants.java index 65dc7432007c6..8c6b79ba7c1d1 100644 --- a/core/java/com/android/internal/logging/MetricsConstants.java +++ b/core/java/com/android/internal/logging/MetricsConstants.java @@ -208,6 +208,27 @@ public interface MetricsConstants { public static final int APPLICATIONS_USAGE_ACCESS_DETAIL = 183; public static final int APPLICATIONS_HIGH_POWER_APPS = 184; public static final int FUELGAUGE_HIGH_POWER_DETAILS = 185; + public static final int ACTION_LS_UNLOCK = 186; + public static final int ACTION_LS_SHADE = 187; + public static final int ACTION_LS_HINT = 188; + public static final int ACTION_LS_CAMERA = 189; + public static final int ACTION_LS_DIALER = 190; + public static final int ACTION_LS_LOCK = 191; + public static final int ACTION_LS_NOTE = 192; + public static final int ACTION_LS_QS = 193; + public static final int ACTION_SHADE_QS_PULL = 194; + public static final int ACTION_SHADE_QS_TAP = 195; + public static final int LOCKSCREEN = 196; + public static final int BOUNCER = 197; + public static final int SCREEN = 198; + public static final int NOTIFICATION_ALERT = 199; + public static final int ACTION_EMERGENCY_CALL = 200; + public static final int APPLICATIONS_MANAGE_ASSIST = 201; + public static final int PROCESS_STATS_SUMMARY = 202; + public static final int ACTION_ROTATION_LOCK = 203; + public static final int ACTION_NOTE_CONTROLS = 204; + public static final int ACTION_NOTE_INFO = 205; + public static final int ACTION_APP_NOTE_SETTINGS = 206; //aliases public static final int DEVICEINFO_STORAGE = DEVICEINFO_MEMORY; diff --git a/core/java/com/android/internal/logging/MetricsLogger.java b/core/java/com/android/internal/logging/MetricsLogger.java index 2f21efdcb28d3..230d96dc6f589 100644 --- a/core/java/com/android/internal/logging/MetricsLogger.java +++ b/core/java/com/android/internal/logging/MetricsLogger.java @@ -27,7 +27,6 @@ import android.view.View; */ public class MetricsLogger implements MetricsConstants { // Temporary constants go here, to await migration to MetricsConstants. - public static final int ACTION_EMERGENCY_CALL = 200; public static void visible(Context context, int category) throws IllegalArgumentException { if (Build.IS_DEBUGGABLE && category == VIEW_UNKNOWN) { From bd6b5fb4c367734b7ba7b55819c792fd8eb6f753 Mon Sep 17 00:00:00 2001 From: Chris Wren Date: Tue, 9 Jun 2015 14:58:34 -0400 Subject: [PATCH 2/2] instrument notification longpress controls Bug: 21700903 Change-Id: Iafd0c16d202ed5dde626ee007259d56aec4de5ec --- .../src/com/android/systemui/statusbar/BaseStatusBar.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index c945fc9d9f6e0..4cce1a4cd0572 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -82,6 +82,7 @@ import android.widget.RemoteViews; import android.widget.TextView; import android.widget.Toast; +import com.android.internal.logging.MetricsLogger; import com.android.internal.statusbar.IStatusBarService; import com.android.internal.statusbar.StatusBarIcon; import com.android.internal.statusbar.StatusBarIconList; @@ -909,6 +910,7 @@ public abstract class BaseStatusBar extends SystemUI implements final int appUidF = appUid; settingsButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { + MetricsLogger.action(mContext, MetricsLogger.ACTION_NOTE_INFO); startAppNotificationSettingsActivity(pkg, appUidF); } }); @@ -929,6 +931,7 @@ public abstract class BaseStatusBar extends SystemUI implements .setClassName(pkg, infos.get(0).activityInfo.name); appSettingsButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { + MetricsLogger.action(mContext, MetricsLogger.ACTION_APP_NOTE_SETTINGS); startAppOwnNotificationSettingsActivity(appSettingsLaunchIntent, sbn.getId(), sbn.getTag(), @@ -975,6 +978,7 @@ public abstract class BaseStatusBar extends SystemUI implements return false; } + MetricsLogger.action(mContext, MetricsLogger.ACTION_NOTE_CONTROLS); guts.setVisibility(View.VISIBLE); final double horz = Math.max(guts.getWidth() - x, x); final double vert = Math.max(guts.getActualHeight() - y, y);