Merge "[WPP logging] Wire logShortcutApplied" into main (b5128ef7) · Commits · e / os / android_packages_apps_ThemePicker

src/com/android/customization/module/ThemePickerInjector.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -238,6 +238,7 @@ internal constructor(
		getKeyguardQuickAffordancePickerInteractor(context),
		getWallpaperInteractor(context),
		getCurrentWallpaperInfoFactory(context),
		getUserEventLogger(context),
		)
		.also { keyguardQuickAffordancePickerViewModelFactory = it }
		}

src/com/android/customization/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModel.kt

+12 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import androidx.annotation.DrawableRes
		import androidx.lifecycle.ViewModel
		import androidx.lifecycle.ViewModelProvider
		import androidx.lifecycle.viewModelScope
		import com.android.customization.module.logging.ThemesUserEventLogger
		import com.android.customization.picker.quickaffordance.domain.interactor.KeyguardQuickAffordancePickerInteractor
		import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordanceSlots
		import com.android.systemui.shared.quickaffordance.shared.model.KeyguardPreviewConstants
		@@ -63,6 +64,7 @@ private constructor(
		private val quickAffordanceInteractor: KeyguardQuickAffordancePickerInteractor,
		private val wallpaperInteractor: WallpaperInteractor,
		private val wallpaperInfoFactory: CurrentWallpaperInfoFactory,
		private val logger: ThemesUserEventLogger,
		) : ViewModel() {

		@SuppressLint("StaticFieldLeak") private val applicationContext = context.applicationContext
		@@ -216,6 +218,10 @@ private constructor(
		{
		viewModelScope.launch {
		quickAffordanceInteractor.unselectAll(selectedSlotId)
		logger.logShortcutApplied(
		shortcut = "none",
		shortcutSlotId = selectedSlotId,
		)
		}
		}
		} else {
		@@ -251,6 +257,10 @@ private constructor(
		slotId = selectedSlotId,
		affordanceId = affordance.id,
		)
		logger.logShortcutApplied(
		shortcut = affordance.id,
		shortcutSlotId = selectedSlotId,
		)
		}
		}
		} else {
		@@ -476,6 +486,7 @@ private constructor(
		private val quickAffordanceInteractor: KeyguardQuickAffordancePickerInteractor,
		private val wallpaperInteractor: WallpaperInteractor,
		private val wallpaperInfoFactory: CurrentWallpaperInfoFactory,
		private val logger: ThemesUserEventLogger,
		) : ViewModelProvider.Factory {
		override fun <T : ViewModel> create(modelClass: Class<T>): T {
		@Suppress("UNCHECKED_CAST")
		@@ -484,6 +495,7 @@ private constructor(
		quickAffordanceInteractor = quickAffordanceInteractor,
		wallpaperInteractor = wallpaperInteractor,
		wallpaperInfoFactory = wallpaperInfoFactory,
		logger = logger,
		)
		as T
		}

tests/robotests/src/com/android/customization/model/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModelTest.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -116,6 +116,7 @@ class KeyguardQuickAffordancePickerViewModelTest {
		quickAffordanceInteractor = quickAffordanceInteractor,
		wallpaperInteractor = wallpaperInteractor,
		wallpaperInfoFactory = TestCurrentWallpaperInfoFactory(context),
		logger = logger,
		)
		.create(KeyguardQuickAffordancePickerViewModel::class.java)
		}