Move LauncherRestoreEventLogger to dagger
Helps us to delete ResourceBasedOverride class. Delete "launcher_restore_event_logger_class" resource from config. Bug: 361850561 Test: Presubmit Flag: EXEMPT dagger Change-Id: Ia11162979f016513bd09e06796346d29699b2efd
This commit is contained in:
@@ -16,8 +16,10 @@
|
||||
|
||||
package com.android.launcher3.dagger
|
||||
|
||||
import com.android.launcher3.backuprestore.LauncherRestoreEventLogger
|
||||
import com.android.launcher3.model.ModelDelegate
|
||||
import com.android.launcher3.model.QuickstepModelDelegate
|
||||
import com.android.quickstep.LauncherRestoreEventLoggerImpl
|
||||
import dagger.Binds
|
||||
import dagger.Module
|
||||
|
||||
@@ -29,4 +31,9 @@ import dagger.Module
|
||||
abstract class AppModule {
|
||||
|
||||
@Binds abstract fun bindModelDelegate(impl: QuickstepModelDelegate): ModelDelegate
|
||||
|
||||
@Binds
|
||||
abstract fun bindRestoreEventLogger(
|
||||
impl: LauncherRestoreEventLoggerImpl
|
||||
): LauncherRestoreEventLogger
|
||||
}
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
<string name="taskbar_model_callbacks_factory_class" translatable="false">com.android.launcher3.taskbar.TaskbarModelCallbacksFactory</string>
|
||||
<string name="taskbar_view_callbacks_factory_class" translatable="false">com.android.launcher3.taskbar.TaskbarViewCallbacksFactory</string>
|
||||
<string name="taskbar_overlay_context_factory_class" translatable="false">com.android.launcher3.taskbar.overlay.TaskbarOverlayContextFactory</string>
|
||||
<string name="launcher_restore_event_logger_class" translatable="false">com.android.quickstep.LauncherRestoreEventLoggerImpl</string>
|
||||
<string name="taskbar_edu_tooltip_controller_class" translatable="false">com.android.launcher3.taskbar.TaskbarEduTooltipController</string>
|
||||
<string name="nav_handle_long_press_handler_class" translatable="false"></string>
|
||||
|
||||
|
||||
@@ -9,13 +9,17 @@ import androidx.annotation.VisibleForTesting
|
||||
import com.android.launcher3.Flags.enableLauncherBrMetricsFixed
|
||||
import com.android.launcher3.LauncherSettings.Favorites
|
||||
import com.android.launcher3.backuprestore.LauncherRestoreEventLogger
|
||||
import com.android.launcher3.dagger.ApplicationContext
|
||||
import javax.inject.Inject
|
||||
|
||||
/**
|
||||
* Concrete implementation for wrapper to log Restore event metrics for both success and failure to
|
||||
* restore Launcher workspace from a backup. This implementation accesses SystemApis so is only
|
||||
* available to QuickStep/NexusLauncher.
|
||||
*/
|
||||
class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEventLogger() {
|
||||
class LauncherRestoreEventLoggerImpl
|
||||
@Inject
|
||||
constructor(@ApplicationContext private val context: Context) : LauncherRestoreEventLogger() {
|
||||
companion object {
|
||||
const val TAG = "LauncherRestoreEventLoggerImpl"
|
||||
|
||||
@@ -43,7 +47,7 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven
|
||||
override fun logLauncherItemsRestoreFailed(
|
||||
@BackupRestoreDataType dataType: String,
|
||||
count: Int,
|
||||
@BackupRestoreError error: String?
|
||||
@BackupRestoreError error: String?,
|
||||
) {
|
||||
if (enableLauncherBrMetricsFixed()) {
|
||||
restoreEventLogger.logItemsRestoreFailed(dataType, count, error)
|
||||
@@ -93,7 +97,7 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven
|
||||
*/
|
||||
override fun logSingleFavoritesItemRestoreFailed(
|
||||
favoritesId: Int,
|
||||
@BackupRestoreError error: String?
|
||||
@BackupRestoreError error: String?,
|
||||
) {
|
||||
if (enableLauncherBrMetricsFixed()) {
|
||||
restoreEventLogger.logItemsRestoreFailed(favoritesIdToDataType(favoritesId), 1, error)
|
||||
@@ -110,13 +114,13 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven
|
||||
override fun logFavoritesItemsRestoreFailed(
|
||||
favoritesId: Int,
|
||||
count: Int,
|
||||
@BackupRestoreError error: String?
|
||||
@BackupRestoreError error: String?,
|
||||
) {
|
||||
if (enableLauncherBrMetricsFixed()) {
|
||||
restoreEventLogger.logItemsRestoreFailed(
|
||||
favoritesIdToDataType(favoritesId),
|
||||
count,
|
||||
error
|
||||
error,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user