[WPP logging] Wire logClockColorApplied and logClockSizeApplied

Test: Manually tested. See bug.
Bug: 305753671
Flag: NONE
Change-Id: Ied843e1b57e8c180e83883fd60377753eae5fc2c

2 files changed, 17 insertions, 1 deletions

diff --git a/tests/common/src/com/android/customization/module/logging/TestThemesUserEventLogger.kt b/tests/common/src/com/android/customization/module/logging/TestThemesUserEventLogger.kt
index e1f4178f..10149f0c 100644
--- a/tests/common/src/com/android/customization/module/logging/TestThemesUserEventLogger.kt
+++ b/tests/common/src/com/android/customization/module/logging/TestThemesUserEventLogger.kt
@@ -15,7 +15,9 @@
  */
 package com.android.customization.module.logging
 
+import android.stats.style.StyleEnums
 import com.android.customization.model.grid.GridOption
+import com.android.customization.module.logging.ThemesUserEventLogger.ClockSize
 import com.android.customization.module.logging.ThemesUserEventLogger.ColorSource
 import com.android.wallpaper.module.logging.TestUserEventLogger
 import javax.inject.Inject
@@ -25,6 +27,7 @@ import javax.inject.Singleton
 @Singleton
 class TestThemesUserEventLogger @Inject constructor() :
     TestUserEventLogger(), ThemesUserEventLogger {
+    @ClockSize private var clockSize: Int = StyleEnums.CLOCK_SIZE_UNSPECIFIED
 
     override fun logThemeColorApplied(@ColorSource source: Int, variant: Int, seedColor: Int) {}
 
@@ -34,7 +37,9 @@ class TestThemesUserEventLogger @Inject constructor() :
 
     override fun logClockColorApplied(seedColor: Int) {}
 
-    override fun logClockSizeApplied(clockSize: Int) {}
+    override fun logClockSizeApplied(@ClockSize clockSize: Int) {
+        this.clockSize = clockSize
+    }
 
     override fun logThemedIconApplied(useThemeIcon: Boolean) {}
 
@@ -43,4 +48,9 @@ class TestThemesUserEventLogger @Inject constructor() :
     override fun logShortcutApplied(shortcut: String, shortcutSlotId: String) {}
 
     override fun logDarkThemeApplied(useDarkTheme: Boolean) {}
+
+    @ClockSize
+    fun getLoggedClockSize(): Int {
+        return clockSize
+    }
 }
diff --git a/tests/robotests/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModelTest.kt b/tests/robotests/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModelTest.kt
index f09e9779..d3ae9cba 100644
--- a/tests/robotests/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModelTest.kt
+++ b/tests/robotests/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModelTest.kt
@@ -1,8 +1,10 @@
 package com.android.customization.picker.clock.ui.viewmodel
 
 import android.content.Context
+import android.stats.style.StyleEnums
 import androidx.test.filters.SmallTest
 import androidx.test.platform.app.InstrumentationRegistry
+import com.android.customization.module.logging.TestThemesUserEventLogger
 import com.android.customization.picker.clock.data.repository.FakeClockPickerRepository
 import com.android.customization.picker.clock.domain.interactor.ClockPickerInteractor
 import com.android.customization.picker.clock.domain.interactor.ClockPickerSnapshotRestorer
@@ -35,6 +37,7 @@ import org.robolectric.RobolectricTestRunner
 @RunWith(RobolectricTestRunner::class)
 class ClockSettingsViewModelTest {
 
+    private val logger = TestThemesUserEventLogger()
     private lateinit var context: Context
     private lateinit var testScope: TestScope
     private lateinit var colorPickerInteractor: ColorPickerInteractor
@@ -81,6 +84,7 @@ class ClockSettingsViewModelTest {
                     context = context,
                     clockPickerInteractor = clockPickerInteractor,
                     colorPickerInteractor = colorPickerInteractor,
+                    logger = logger,
                     getIsReactiveToTone = getIsReactiveToTone,
                 )
                 .create(ClockSettingsViewModel::class.java)
@@ -186,9 +190,11 @@ class ClockSettingsViewModelTest {
         val observedClockSize = collectLastValue(underTest.selectedClockSize)
         underTest.setClockSize(ClockSize.DYNAMIC)
         assertThat(observedClockSize()).isEqualTo(ClockSize.DYNAMIC)
+        assertThat(logger.getLoggedClockSize()).isEqualTo(StyleEnums.CLOCK_SIZE_DYNAMIC)
 
         underTest.setClockSize(ClockSize.SMALL)
         assertThat(observedClockSize()).isEqualTo(ClockSize.SMALL)
+        assertThat(logger.getLoggedClockSize()).isEqualTo(StyleEnums.CLOCK_SIZE_SMALL)
     }
 
     @Test