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

Commit 00baef51 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11117647 from eef444cf to 24Q1-release 

Change-Id: I2c6c94844101443ea76ffe82d0d28fd041838bfa
parents cdeec9b3 eef444cf

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

+16 −20
Original line number Diff line number Diff line
@@ -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 = ""

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

+4 −1
Original line number Diff line number Diff line
@@ -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

src/com/android/customization/picker/quickaffordance/ui/adapter/SlotTabAdapter.kt

+3 −1
Original line number Diff line number Diff line
@@ -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) {