From 5c6e12a8d4b59896792d0ad129341ad337659002 Mon Sep 17 00:00:00 2001 From: Sunny Shao Date: Mon, 6 Mar 2023 16:27:33 +0800 Subject: [PATCH] Add the SPA page enter/leave logging metrcis - Update LogEvent adding mapped Action ID in theSettingsEnums. - Add the SESSION_EXTERNAL and SESSION_UNKNOWN. Fixes: 271793388 Bug: 253979024 Test: atest SpaLogDataTest MetricsDataModelTest Change-Id: I565d5bebac46e82cc83e28bf532e1d3bcd76a473 --- .../settingslib/spa/framework/common/SpaLogger.kt | 14 ++++++++------ .../settingslib/spa/framework/util/SpaIntent.kt | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaLogger.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaLogger.kt index 78df0f27cc6ad..ca88f8da63c93 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaLogger.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaLogger.kt @@ -16,6 +16,7 @@ package com.android.settingslib.spa.framework.common +import android.app.settings.SettingsEnums import android.os.Bundle // Defines the category of the log, for quick filter @@ -31,20 +32,21 @@ enum class LogCategory { } // Defines the log events in Spa. -enum class LogEvent { +enum class LogEvent(val action: Int) { // Page related events. - PAGE_ENTER, - PAGE_LEAVE, + PAGE_ENTER(SettingsEnums.PAGE_VISIBLE), + PAGE_LEAVE(SettingsEnums.PAGE_HIDE), // Entry related events. - ENTRY_CLICK, - ENTRY_SWITCH, + ENTRY_CLICK(SettingsEnums.ACTION_SETTINGS_TILE_CLICK), + ENTRY_SWITCH(SettingsEnums.ACTION_SETTINGS_PREFERENCE_CHANGE), } internal const val LOG_DATA_DISPLAY_NAME = "name" -internal const val LOG_DATA_SESSION_NAME = "session" internal const val LOG_DATA_SWITCH_STATUS = "switch" +const val LOG_DATA_SESSION_NAME = "session" + /** * The interface of logger in Spa */ diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/util/SpaIntent.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/util/SpaIntent.kt index 2c3c2e003832c..d8c35a36d0611 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/util/SpaIntent.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/util/SpaIntent.kt @@ -22,9 +22,11 @@ import com.android.settingslib.spa.framework.common.SettingsEntry import com.android.settingslib.spa.framework.common.SettingsPage import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory +const val SESSION_UNKNOWN = "unknown" const val SESSION_BROWSE = "browse" const val SESSION_SEARCH = "search" const val SESSION_SLICE = "slice" +const val SESSION_EXTERNAL = "external" const val KEY_DESTINATION = "spaActivityDestination" const val KEY_HIGHLIGHT_ENTRY = "highlightEntry"