diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-18 02:20:24 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-18 02:20:24 +0000 |
commit | 00baef517ffa9ade26b6f2daf48671c2e7fad1c5 (patch) | |
tree | e8bb6540ccb2c8e6807e19cac9f63dc85fc63c94 | |
parent | cdeec9b33b697aa3d193afaafc84ad57e0b5b203 (diff) | |
parent | eef444cf57676751eabccba7d84b42f2f23e3685 (diff) | |
download | ThemePicker-00baef517ffa9ade26b6f2daf48671c2e7fad1c5.tar.gz |
Snap for 11117647 from eef444cf57676751eabccba7d84b42f2f23e3685 to 24Q1-release
Change-Id: I2c6c94844101443ea76ffe82d0d28fd041838bfa
3 files changed, 23 insertions, 22 deletions
diff --git a/src/com/android/customization/module/logging/SysUiStatsLogger.kt b/src/com/android/customization/module/logging/SysUiStatsLogger.kt index 6c55df8f..111c2c23 100644 --- a/src/com/android/customization/module/logging/SysUiStatsLogger.kt +++ b/src/com/android/customization/module/logging/SysUiStatsLogger.kt @@ -15,15 +15,15 @@ */ package com.android.customization.module.logging +import android.stats.style.StyleEnums.CLOCK_SIZE_UNSPECIFIED +import android.stats.style.StyleEnums.COLOR_SOURCE_UNSPECIFIED +import android.stats.style.StyleEnums.DATE_PREFERENCE_UNSPECIFIED +import android.stats.style.StyleEnums.EFFECT_PREFERENCE_UNSPECIFIED +import android.stats.style.StyleEnums.LAUNCHED_PREFERENCE_UNSPECIFIED +import android.stats.style.StyleEnums.LOCATION_PREFERENCE_UNSPECIFIED +import android.stats.style.StyleEnums.SET_WALLPAPER_ENTRY_POINT_UNSPECIFIED +import android.stats.style.StyleEnums.WALLPAPER_DESTINATION_UNSPECIFIED import com.android.systemui.shared.system.SysUiStatsLog -import com.android.systemui.shared.system.SysUiStatsLog.STYLE_UICHANGED__CLOCK_SIZE__CLOCK_SIZE_UNSPECIFIED -import com.android.systemui.shared.system.SysUiStatsLog.STYLE_UICHANGED__COLOR_SOURCE__COLOR_SOURCE_UNSPECIFIED -import com.android.systemui.shared.system.SysUiStatsLog.STYLE_UICHANGED__DATE_PREFERENCE__DATE_PREFERENCE_UNSPECIFIED -import com.android.systemui.shared.system.SysUiStatsLog.STYLE_UICHANGED__EFFECT_PREFERENCE__EFFECT_PREFERENCE_UNSPECIFIED -import com.android.systemui.shared.system.SysUiStatsLog.STYLE_UICHANGED__LAUNCHED_PREFERENCE__LAUNCHED_PREFERENCE_UNSPECIFIED -import com.android.systemui.shared.system.SysUiStatsLog.STYLE_UICHANGED__LOCATION_PREFERENCE__LOCATION_PREFERENCE_UNSPECIFIED -import com.android.systemui.shared.system.SysUiStatsLog.STYLE_UICHANGED__SET_WALLPAPER_ENTRY_POINT__SET_WALLPAPER_ENTRY_POINT_UNSPECIFIED -import com.android.systemui.shared.system.SysUiStatsLog.STYLE_UICHANGED__WALLPAPER_DESTINATION__WALLPAPER_DESTINATION_UNSPECIFIED import com.android.systemui.shared.system.SysUiStatsLog.STYLE_UI_CHANGED import com.android.wallpaper.module.logging.UserEventLogger.SetWallpaperEntryPoint @@ -38,12 +38,10 @@ class SysUiStatsLogger(val action: Int) { private var wallpaperCategoryHash = 0 private var wallpaperIdHash = 0 private var colorPreference = 0 - private var locationPreference = - STYLE_UICHANGED__LOCATION_PREFERENCE__LOCATION_PREFERENCE_UNSPECIFIED - private var datePreference = STYLE_UICHANGED__DATE_PREFERENCE__DATE_PREFERENCE_UNSPECIFIED - private var launchedPreference = - STYLE_UICHANGED__LAUNCHED_PREFERENCE__LAUNCHED_PREFERENCE_UNSPECIFIED - private var effectPreference = STYLE_UICHANGED__EFFECT_PREFERENCE__EFFECT_PREFERENCE_UNSPECIFIED + private var locationPreference = LOCATION_PREFERENCE_UNSPECIFIED + private var datePreference = DATE_PREFERENCE_UNSPECIFIED + private var launchedPreference = LAUNCHED_PREFERENCE_UNSPECIFIED + private var effectPreference = EFFECT_PREFERENCE_UNSPECIFIED private var effectIdHash = 0 private var lockWallpaperCategoryHash = 0 private var lockWallpaperIdHash = 0 @@ -54,13 +52,11 @@ class SysUiStatsLogger(val action: Int) { private var timeElapsedMillis = 0L private var effectResultCode = -1 private var appSessionId = 0 - private var setWallpaperEntryPoint = - STYLE_UICHANGED__SET_WALLPAPER_ENTRY_POINT__SET_WALLPAPER_ENTRY_POINT_UNSPECIFIED - private var wallpaperDestination = - STYLE_UICHANGED__WALLPAPER_DESTINATION__WALLPAPER_DESTINATION_UNSPECIFIED - private var colorSource = STYLE_UICHANGED__COLOR_SOURCE__COLOR_SOURCE_UNSPECIFIED + private var setWallpaperEntryPoint = SET_WALLPAPER_ENTRY_POINT_UNSPECIFIED + private var wallpaperDestination = WALLPAPER_DESTINATION_UNSPECIFIED + private var colorSource = COLOR_SOURCE_UNSPECIFIED private var seedColor = 0 - private var clockSize = STYLE_UICHANGED__CLOCK_SIZE__CLOCK_SIZE_UNSPECIFIED + private var clockSize = CLOCK_SIZE_UNSPECIFIED private var toggleOn = false private var shortcut = "" private var shortcutSlotId = "" diff --git a/src/com/android/customization/module/logging/ThemesUserEventLoggerImpl.kt b/src/com/android/customization/module/logging/ThemesUserEventLoggerImpl.kt index 1441c717..3f4a6dc4 100644 --- a/src/com/android/customization/module/logging/ThemesUserEventLoggerImpl.kt +++ b/src/com/android/customization/module/logging/ThemesUserEventLoggerImpl.kt @@ -25,6 +25,7 @@ import android.stats.style.StyleEnums.DARK_THEME_APPLIED import android.stats.style.StyleEnums.GRID_APPLIED import android.stats.style.StyleEnums.LAUNCHED_CROP_AND_SET_ACTION import android.stats.style.StyleEnums.LAUNCHED_DEEP_LINK +import android.stats.style.StyleEnums.LAUNCHED_KEYGUARD import android.stats.style.StyleEnums.LAUNCHED_LAUNCHER import android.stats.style.StyleEnums.LAUNCHED_LAUNCH_ICON import android.stats.style.StyleEnums.LAUNCHED_PREFERENCE_UNSPECIFIED @@ -55,6 +56,7 @@ import com.android.wallpaper.module.WallpaperPreferences import com.android.wallpaper.module.logging.UserEventLogger.EffectStatus import com.android.wallpaper.module.logging.UserEventLogger.SetWallpaperEntryPoint import com.android.wallpaper.module.logging.UserEventLogger.WallpaperDestination +import com.android.wallpaper.util.ActivityUtils import com.android.wallpaper.util.LaunchSourceUtils import javax.inject.Inject import javax.inject.Singleton @@ -246,9 +248,10 @@ constructor( LaunchSourceUtils.LAUNCH_SOURCE_SUW -> LAUNCHED_SUW LaunchSourceUtils.LAUNCH_SOURCE_TIPS -> LAUNCHED_TIPS LaunchSourceUtils.LAUNCH_SOURCE_DEEP_LINK -> LAUNCHED_DEEP_LINK + LaunchSourceUtils.LAUNCH_SOURCE_KEYGUARD -> LAUNCHED_KEYGUARD else -> LAUNCHED_PREFERENCE_UNSPECIFIED } - } else if (hasExtra(LaunchSourceUtils.LAUNCH_SETTINGS_SEARCH)) { + } else if (ActivityUtils.isLaunchedFromSettingsSearch(this)) { LAUNCHED_SETTINGS_SEARCH } else if (action != null && action == WallpaperManager.ACTION_CROP_AND_SET_WALLPAPER) { LAUNCHED_CROP_AND_SET_ACTION diff --git a/src/com/android/customization/picker/quickaffordance/ui/adapter/SlotTabAdapter.kt b/src/com/android/customization/picker/quickaffordance/ui/adapter/SlotTabAdapter.kt index 8891b03f..0e3b7167 100644 --- a/src/com/android/customization/picker/quickaffordance/ui/adapter/SlotTabAdapter.kt +++ b/src/com/android/customization/picker/quickaffordance/ui/adapter/SlotTabAdapter.kt @@ -67,7 +67,9 @@ class SlotTabAdapter : RecyclerView.Adapter<SlotTabAdapter.ViewHolder>() { .find { it.isSelected.value } ?.text ?.asString(holder.itemView.context) - stateDescription?.let { holder.itemView.stateDescription = it } + holder.itemView.stateDescription = + stateDescription + ?: holder.itemView.resources.getString(R.string.keyguard_affordance_none) } class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { |