diff options
| author | George Lin <giolin@google.com> | 2024-01-27 13:04:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2024-01-27 13:04:28 +0000 |
| commit | 0bcc2ee37ba46ce97270cc6d922311510c6e0496 (patch) | |
| tree | 43934ace9ff63645f356d55be28a25b373c0475d /src/com/android/customization | |
| parent | 877d6e0dc7177fad178421ce96e5f85bd1a624d4 (diff) | |
| parent | c9696a03fa934b80bd3f5761f4f56f753af0080a (diff) | |
| download | ThemePicker-0bcc2ee37ba46ce97270cc6d922311510c6e0496.tar.gz | |
Merge "Support logging effect ID has for lock wallpaper (2/3)" into main
Diffstat (limited to 'src/com/android/customization')
| -rw-r--r-- | src/com/android/customization/module/logging/SysUiStatsLogger.kt | 6 | ||||
| -rw-r--r-- | src/com/android/customization/module/logging/ThemesUserEventLoggerImpl.kt | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/com/android/customization/module/logging/SysUiStatsLogger.kt b/src/com/android/customization/module/logging/SysUiStatsLogger.kt index 111c2c23..71363fb4 100644 --- a/src/com/android/customization/module/logging/SysUiStatsLogger.kt +++ b/src/com/android/customization/module/logging/SysUiStatsLogger.kt @@ -60,6 +60,7 @@ class SysUiStatsLogger(val action: Int) { private var toggleOn = false private var shortcut = "" private var shortcutSlotId = "" + private var lockEffectIdHash = 0 fun setColorPackageHash(colorPackageHash: Int) = apply { this.colorPackageHash = colorPackageHash @@ -151,6 +152,10 @@ class SysUiStatsLogger(val action: Int) { fun setShortcutSlotId(shortcutSlotId: String) = apply { this.shortcutSlotId = shortcutSlotId } + fun setLockEffectIdHash(lockEffectIdHash: Int) = apply { + this.lockEffectIdHash = lockEffectIdHash + } + fun log() { SysUiStatsLog.write( STYLE_UI_CHANGED, @@ -185,6 +190,7 @@ class SysUiStatsLogger(val action: Int) { toggleOn, shortcut, shortcutSlotId, + lockEffectIdHash, ) } } diff --git a/src/com/android/customization/module/logging/ThemesUserEventLoggerImpl.kt b/src/com/android/customization/module/logging/ThemesUserEventLoggerImpl.kt index 3f4a6dc4..b28086b4 100644 --- a/src/com/android/customization/module/logging/ThemesUserEventLoggerImpl.kt +++ b/src/com/android/customization/module/logging/ThemesUserEventLoggerImpl.kt @@ -75,9 +75,10 @@ constructor( SysUiStatsLogger(SNAPSHOT) .setWallpaperCategoryHash(preferences.getHomeCategoryHash()) .setWallpaperIdHash(preferences.getHomeWallpaperIdHash()) + .setEffectIdHash(preferences.getHomeWallpaperEffectsIdHash()) .setLockWallpaperCategoryHash(preferences.getLockCategoryHash()) .setLockWallpaperIdHash(preferences.getLockWallpaperIdHash()) - .setEffectIdHash(preferences.getHomeWallpaperEffectsIdHash()) + .setLockEffectIdHash(preferences.getLockWallpaperEffectsIdHash()) .setColorSource(colorManager.currentColorSourceForLogging) .setColorVariant(colorManager.currentStyleForLogging) .setSeedColor(colorManager.currentSeedColorForLogging) @@ -110,9 +111,10 @@ constructor( .setAppSessionId(appSessionId.getId()) .setWallpaperCategoryHash(if (isHomeWallpaperSet) categoryHash else 0) .setWallpaperIdHash(if (isHomeWallpaperSet) wallpaperIdHash else 0) + .setEffectIdHash(if (isHomeWallpaperSet) getIdHashCode(effects) else 0) .setLockWallpaperCategoryHash(if (isLockWallpaperSet) categoryHash else 0) .setLockWallpaperIdHash(if (isLockWallpaperSet) wallpaperIdHash else 0) - .setEffectIdHash(getIdHashCode(effects)) + .setLockEffectIdHash(if (isLockWallpaperSet) getIdHashCode(effects) else 0) .setSetWallpaperEntryPoint(setWallpaperEntryPoint) .setWallpaperDestination(destination) .log() @@ -293,6 +295,11 @@ constructor( return getIdHashCode(getHomeWallpaperEffects()) } + /** If not set, the output hash is 0. */ + private fun WallpaperPreferences.getLockWallpaperEffectsIdHash(): Int { + return getIdHashCode(getLockWallpaperEffects()) + } + private fun getIdHashCode(id: String?): Int { return id?.hashCode() ?: 0 } |