Merge "Adds a legacy flag to enable Launcher BR metrics." into main

This commit is contained in:
Charlie Anderson
2024-01-05 01:32:11 +00:00
committed by Android (Google) Code Review
3 changed files with 14 additions and 10 deletions

View File

@@ -5,9 +5,10 @@ import android.app.backup.BackupRestoreEventLogger
import android.app.backup.BackupRestoreEventLogger.BackupRestoreDataType
import android.app.backup.BackupRestoreEventLogger.BackupRestoreError
import android.content.Context
import com.android.launcher3.Flags
import com.android.launcher3.Flags.enableLauncherBrMetrics
import com.android.launcher3.LauncherSettings.Favorites
import com.android.launcher3.backuprestore.LauncherRestoreEventLogger
import com.android.launcher3.config.FeatureFlags.ENABLE_LAUNCHER_BR_METRICS
/**
* Concrete implementation for wrapper to log Restore event metrics for both success and failure to
@@ -44,7 +45,7 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven
count: Int,
@BackupRestoreError error: String?
) {
if (Flags.enableLauncherBrMetrics()) {
if (enableLauncherBrMetrics() || ENABLE_LAUNCHER_BR_METRICS.get()) {
restoreEventLogger.logItemsRestoreFailed(dataType, count, error)
}
}
@@ -56,7 +57,7 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven
* @param count the number of data items restored.
*/
override fun logLauncherItemsRestored(@BackupRestoreDataType dataType: String, count: Int) {
if (Flags.enableLauncherBrMetrics()) {
if (enableLauncherBrMetrics() || ENABLE_LAUNCHER_BR_METRICS.get()) {
restoreEventLogger.logItemsRestored(dataType, count)
}
}
@@ -67,7 +68,7 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven
* @param favoritesId The id of the item type from [Favorites] that was restored.
*/
override fun logSingleFavoritesItemRestored(favoritesId: Int) {
if (Flags.enableLauncherBrMetrics()) {
if (enableLauncherBrMetrics() || ENABLE_LAUNCHER_BR_METRICS.get()) {
restoreEventLogger.logItemsRestored(favoritesIdToDataType(favoritesId), 1)
}
}
@@ -79,7 +80,7 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven
* @param count number of items that restored.
*/
override fun logFavoritesItemsRestored(favoritesId: Int, count: Int) {
if (Flags.enableLauncherBrMetrics()) {
if (enableLauncherBrMetrics() || ENABLE_LAUNCHER_BR_METRICS.get()) {
restoreEventLogger.logItemsRestored(favoritesIdToDataType(favoritesId), count)
}
}
@@ -94,7 +95,7 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven
favoritesId: Int,
@BackupRestoreError error: String?
) {
if (Flags.enableLauncherBrMetrics()) {
if (enableLauncherBrMetrics() || ENABLE_LAUNCHER_BR_METRICS.get()) {
restoreEventLogger.logItemsRestoreFailed(favoritesIdToDataType(favoritesId), 1, error)
}
}
@@ -111,7 +112,7 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven
count: Int,
@BackupRestoreError error: String?
) {
if (Flags.enableLauncherBrMetrics()) {
if (enableLauncherBrMetrics() || ENABLE_LAUNCHER_BR_METRICS.get()) {
restoreEventLogger.logItemsRestoreFailed(
favoritesIdToDataType(favoritesId),
count,
@@ -125,7 +126,7 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven
* done restoring items for Launcher.
*/
override fun reportLauncherRestoreResults() {
if (Flags.enableLauncherBrMetrics()) {
if (enableLauncherBrMetrics() || ENABLE_LAUNCHER_BR_METRICS.get()) {
BackupManager(context).reportDelayedRestoreResult(restoreEventLogger)
}
}