Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e43dbea authored by George Lin's avatar George Lin
Browse files

Log more customizations in snapshot logging (2/2) 

Test: Made sure the other features are logged
Bug: 409336077
Flag: com.android.systemui.shared.new_customization_picker_ui
Change-Id: I5ce58505ed77af62477e43ab05bbcaa712272dff
parent ca472db4

src/com/android/customization/module/logging/SelectedClockLoggingData.kt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.customization.module.logging



import com.android.customization.module.logging.ThemesUserEventLogger.ClockSize



data class SelectedClockLoggingData(

    val clockIdHash: Int,

    val clockSeedColor: Int,

    val useClockCustomization: Boolean,

    @ClockSize val clockSize: Int,

)

src/com/android/customization/module/logging/ThemesUserEventLoggerImpl.kt

+88 −4
Original line number Diff line number Diff line
@@ -17,11 +17,15 @@ package com.android.customization.module.logging 


import android.app.WallpaperManager

import android.content.Intent

import android.stats.style.StyleEnums

import android.stats.style.StyleEnums.APP_ICON_STYLE_THEMED

import android.stats.style.StyleEnums.APP_ICON_STYLE_UNSPECIFIED

import android.stats.style.StyleEnums.APP_LAUNCHED

import android.stats.style.StyleEnums.CLOCK_APPLIED

import android.stats.style.StyleEnums.CLOCK_COLOR_APPLIED

import android.stats.style.StyleEnums.CLOCK_SIZE_APPLIED

import android.stats.style.StyleEnums.CLOCK_SIZE_DYNAMIC

import android.stats.style.StyleEnums.CLOCK_SIZE_SMALL

import android.stats.style.StyleEnums.CURATED_PHOTOS_FETCH_END

import android.stats.style.StyleEnums.CURATED_PHOTOS_RENDER_COMPLETE

import android.stats.style.StyleEnums.DARK_THEME_APPLIED

import android.stats.style.StyleEnums.ENTER_SCREEN
@@ -58,10 +62,18 @@ import android.stats.style.StyleEnums.WALLPAPER_EFFECT_FG_DOWNLOAD 
import android.stats.style.StyleEnums.WALLPAPER_EFFECT_PROBE

import android.stats.style.StyleEnums.WALLPAPER_EXPLORE

import android.text.TextUtils

import android.util.Log

import com.android.customization.model.color.ColorCustomizationManager

import com.android.customization.model.grid.GridOptionModel

import com.android.customization.model.grid.ShapeGridManager

import com.android.customization.model.grid.ShapeOptionModel

import com.android.customization.module.logging.ThemesUserEventLogger.ClockSize

import com.android.customization.module.logging.ThemesUserEventLogger.ColorSource

import com.android.customization.picker.clock.data.repository.ClockPickerRepository

import com.android.customization.picker.clock.shared.ClockSize.DYNAMIC

import com.android.customization.picker.clock.shared.ClockSize.SMALL

import com.android.customization.picker.themedicon.data.repository.ThemedIconRepository

import com.android.systemui.shared.customization.data.content.CustomizationProviderClient

import com.android.wallpaper.customization.ui.util.ThemePickerCustomizationOptionUtil.ThemePickerHomeCustomizationOption.APP_ICONS

import com.android.wallpaper.customization.ui.util.ThemePickerCustomizationOptionUtil.ThemePickerHomeCustomizationOption.COLORS

import com.android.wallpaper.customization.ui.util.ThemePickerCustomizationOptionUtil.ThemePickerHomeCustomizationOption.GRID
@@ -78,6 +90,7 @@ import com.android.wallpaper.util.LaunchSourceUtils 
import io.grpc.Status

import javax.inject.Inject

import javax.inject.Singleton

import kotlinx.coroutines.flow.first



/** StatsLog-backed implementation of [ThemesUserEventLogger]. */

@Singleton
@@ -86,12 +99,17 @@ class ThemesUserEventLoggerImpl 
constructor(

    private val preferences: WallpaperPreferences,

    private val colorManager: ColorCustomizationManager,

    private val shapeGridManager: ShapeGridManager,

    private val themedIconRepository: ThemedIconRepository,

    private val clockPickerRepository: ClockPickerRepository,

    private val customizationProviderClient: CustomizationProviderClient,

    private val appSessionId: AppSessionId,

    private val sysUiStatsLoggerFactory: SysUiStatsLoggerFactory,

) : ThemesUserEventLogger {



    override fun logSnapshot() {

        // TODO(b/409336077): Log more customizable features, e.g. clock, grid, app icon shape, ...

    override suspend fun logSnapshot() {

        val selectedClockLoggingData = clockPickerRepository.getSelectedClockLoggingData()



        sysUiStatsLoggerFactory

            .get(SNAPSHOT)

            .setWallpaperCategoryHash(preferences.getHomeCategoryHash())
@@ -103,6 +121,14 @@ constructor( 
            .setColorSource(colorManager.currentColorSourceForLogging)

            .setColorVariant(colorManager.currentStyleForLogging)

            .setSeedColor(colorManager.currentSeedColorForLogging)

            .setShapePackageHash(shapeGridManager.getSelectedShapeIdHash())

            .setAppIconStyle(themedIconRepository.getAppIconStyle())

            .setLauncherGrid(shapeGridManager.getSelectedGridInt())

            .setClockPackageHash(selectedClockLoggingData.clockIdHash)

            .setClockSeedColor(selectedClockLoggingData.clockSeedColor)

            .setUseClockCustomization(selectedClockLoggingData.useClockCustomization)

            .setClockSize(selectedClockLoggingData.clockSize)

            .setShortcut(customizationProviderClient.getSelectedShortcutsString())

            .log()

    }
@@ -286,7 +312,7 @@ constructor( 


    override fun logCuratedPhotosFetched(timeElapsedMillis: Long, status: Status) {

        sysUiStatsLoggerFactory

            .get(StyleEnums.CURATED_PHOTOS_FETCH_END)

            .get(CURATED_PHOTOS_FETCH_END)

            .setAppSessionId(appSessionId.getId())

            .setTimeElapsed(timeElapsedMillis)

            .log()
@@ -319,6 +345,10 @@ constructor( 
     * The upper limit for the column / row count is 99.

     */

    private fun GridOptionModel.getLauncherGridInt(): Int {

        return getLauncherGridInt(cols, rows)

    }



    private fun getLauncherGridInt(cols: Int, rows: Int): Int {

        return cols * 100 + rows

    }
@@ -380,7 +410,61 @@ constructor( 
        return getIdHashCode(getLockWallpaperEffects())

    }



    private suspend fun ShapeGridManager.getSelectedShapeIdHash(): Int {

        val selectedShape: ShapeOptionModel? =

            try {

                getShapeOptions().firstOrNull { it.isCurrent }

            } catch (e: Exception) {

                Log.e(TAG, "Fail to get shape options. Skip logging selected shape.", e)

                null

            }

        return getIdHashCode(selectedShape?.key)

    }



    private suspend fun ShapeGridManager.getSelectedGridInt(): Int {

        val selectedGrid: GridOptionModel? =

            try {

                getGridOptions().firstOrNull { it.isCurrent }

            } catch (e: Exception) {

                Log.e(TAG, "Fail to get grid options. Skip logging selected grid.", e)

                null

            }

        return selectedGrid?.getLauncherGridInt() ?: 0

    }



    private suspend fun ThemedIconRepository.getAppIconStyle(): Int {

        val isThemedIconActivated = isActivated.first()

        return if (isThemedIconActivated) APP_ICON_STYLE_THEMED else APP_ICON_STYLE_UNSPECIFIED

    }



    private suspend fun ClockPickerRepository.getSelectedClockLoggingData():

        SelectedClockLoggingData {

        val selectedClock = selectedClock.first()

        val selectedClockSize = selectedClockSize.first()

        return SelectedClockLoggingData(

            clockIdHash = getIdHashCode(selectedClock.clockId),

            clockSeedColor = selectedClock.seedColor ?: 0,

            useClockCustomization = selectedClock.axisPresetConfig?.current != null,

            clockSize =

                when (selectedClockSize) {

                    SMALL -> CLOCK_SIZE_SMALL

                    DYNAMIC -> CLOCK_SIZE_DYNAMIC

                },

        )

    }



    private suspend fun CustomizationProviderClient.getSelectedShortcutsString(): String {

        val shortcutSelections = querySelections()

        return shortcutSelections.joinToString(separator = ",") {

            "${it.slotId}:${it.affordanceId}"

        }

    }



    private fun getIdHashCode(id: String?): Int {

        return id?.hashCode() ?: 0

    }



    companion object {

        private const val TAG = "ThemesUserEventLoggerImpl"

    }

}

src/com/android/customization/picker/themedicon/data/repository/ThemedIconRepositoryImpl.kt

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ constructor( 
                initialValue = false,

            )



    private fun getThemedIconEnabled(uri: Uri): Boolean {

    fun getThemedIconEnabled(uri: Uri): Boolean {

        val cursor =

            contentResolver.query(

                uri,

tests/robotests/src/com/android/customization/module/logging/ThemesUserEventLoggerImplTest.kt

+69 −19
Original line number Diff line number Diff line
@@ -27,7 +27,15 @@ import android.stats.style.StyleEnums.SCREEN_SHORTCUTS 
import android.stats.style.StyleEnums.SNAPSHOT

import androidx.test.filters.SmallTest

import com.android.customization.model.color.ColorCustomizationManager

import com.android.customization.model.grid.FakeShapeGridManager

import com.android.customization.model.grid.GridOptionModel

import com.android.customization.model.grid.ShapeGridManager

import com.android.customization.picker.clock.data.repository.ClockPickerRepository

import com.android.customization.picker.clock.data.repository.FakeClockPickerRepository

import com.android.customization.picker.themedicon.data.repository.ThemedIconRepository

import com.android.systemui.shared.customization.data.content.CustomizationProviderClient

import com.android.systemui.shared.customization.data.content.FakeCustomizationProviderClient

import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordanceSlots

import com.android.wallpaper.customization.ui.util.ThemePickerCustomizationOptionUtil.ThemePickerHomeCustomizationOption.APP_ICONS

import com.android.wallpaper.customization.ui.util.ThemePickerCustomizationOptionUtil.ThemePickerHomeCustomizationOption.COLORS

import com.android.wallpaper.customization.ui.util.ThemePickerCustomizationOptionUtil.ThemePickerHomeCustomizationOption.GRID
@@ -39,6 +47,8 @@ import com.google.common.truth.Truth.assertThat 
import dagger.hilt.android.testing.HiltAndroidRule

import dagger.hilt.android.testing.HiltAndroidTest

import javax.inject.Inject

import kotlinx.coroutines.test.TestScope

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Rule

import org.junit.Test
@@ -52,8 +62,23 @@ class ThemesUserEventLoggerImplTest { 


    @get:Rule var hiltRule = HiltAndroidRule(this)



    @Inject lateinit var testScope: TestScope



    @Inject lateinit var wallpaperPreferences: WallpaperPreferences

    @Inject lateinit var colorCustomizationManager: ColorCustomizationManager

    @Inject lateinit var shapeGridManager: ShapeGridManager

    @Inject lateinit var themedIconRepository: ThemedIconRepository

    private val clockPickerRepository: ClockPickerRepository = FakeClockPickerRepository()

    private var customizationProviderClient: CustomizationProviderClient =

        FakeCustomizationProviderClient(

            initialSelections =

                mapOf(

                    KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_START to

                        listOf(FakeCustomizationProviderClient.AFFORDANCE_1),

                    KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_END to

                        listOf(FakeCustomizationProviderClient.AFFORDANCE_2),

                )

        )

    @Inject lateinit var appSessionId: AppSessionId

    @Inject lateinit var sysUiStatsLoggerFactory: SysUiStatsLoggerFactory
@@ -80,20 +105,26 @@ class ThemesUserEventLoggerImplTest { 
            ThemesUserEventLoggerImpl(

                wallpaperPreferences,

                colorCustomizationManager,

                shapeGridManager,

                themedIconRepository,

                clockPickerRepository,

                customizationProviderClient,

                appSessionId,

                sysUiStatsLoggerFactory,

            )

    }



    @Test

    fun logSnapshot_logsCorrectData() {

    fun logSnapshot_logsCorrectData() =

        testScope.runTest {

            underTest.logSnapshot()



            assertThat(fakeStatsLogger.action).isEqualTo(SNAPSHOT)

            assertThat(fakeStatsLogger.logCalled).isTrue()

            assertThat(fakeStatsLogger.wallpaperCategoryHash)

                .isEqualTo(TEST_WALLPAPER_COLLECTION_ID.hashCode())

        assertThat(fakeStatsLogger.wallpaperIdHash).isEqualTo(TEST_WALLPAPER_REMOTE_ID.hashCode())

            assertThat(fakeStatsLogger.wallpaperIdHash)

                .isEqualTo(TEST_WALLPAPER_REMOTE_ID.hashCode())

            assertThat(fakeStatsLogger.effectIdHash).isEqualTo(TEST_WALLPAPER_EFFECT.hashCode())

            assertThat(fakeStatsLogger.lockWallpaperCategoryHash)

                .isEqualTo(TEST_LOCK_WALLPAPER_COLLECTION_ID.hashCode())
@@ -104,6 +135,25 @@ class ThemesUserEventLoggerImplTest { 
            assertThat(fakeStatsLogger.colorSource).isEqualTo(0)

            assertThat(fakeStatsLogger.colorVariant).isEqualTo(0)

            assertThat(fakeStatsLogger.seedColor).isEqualTo(0)

            assertThat(fakeStatsLogger.shapePackageHash)

                .isEqualTo(

                    FakeShapeGridManager.DEFAULT_SHAPE_OPTION_LIST.first { it.isCurrent }

                        .key

                        .hashCode()

                )

            assertThat(fakeStatsLogger.appIconStyle)

                .isEqualTo(StyleEnums.APP_ICON_STYLE_UNSPECIFIED)

            assertThat(fakeStatsLogger.launcherGrid)

                .isEqualTo(

                    FakeShapeGridManager.DEFAULT_GRID_OPTION_LIST.first { it.isCurrent }

                        .let { it.cols * 100 + it.rows }

                )

            assertThat(fakeStatsLogger.clockPackageHash)

                .isEqualTo(FakeClockPickerRepository.CLOCK_ID_0.hashCode())

            assertThat(fakeStatsLogger.clockSeedColor).isEqualTo(0)

            assertThat(fakeStatsLogger.clockSize).isEqualTo(StyleEnums.CLOCK_SIZE_DYNAMIC)

            assertThat(fakeStatsLogger.shortcut)

                .isEqualTo("bottom_start:affordance_1,bottom_end:affordance_2")

        }



    @Test