Snap for 10909147 from 81d4ddbac7f68cfd403b7f91d460dc8b2d999745 to 24Q1-release (9629dece) · Commits · e / os / android_packages_apps_ThemePicker

src/com/android/customization/module/ThemePickerInjector.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ import com.android.customization.picker.clock.data.repository.ClockRegistryProvi
		import com.android.customization.picker.clock.domain.interactor.ClockPickerInteractor
		import com.android.customization.picker.clock.domain.interactor.ClockPickerSnapshotRestorer
		import com.android.customization.picker.clock.ui.view.ClockViewFactory
		import com.android.customization.picker.clock.ui.view.ClockViewFactoryImpl
		import com.android.customization.picker.clock.ui.viewmodel.ClockCarouselViewModel
		import com.android.customization.picker.clock.ui.viewmodel.ClockSectionViewModel
		import com.android.customization.picker.clock.ui.viewmodel.ClockSettingsViewModel
		@@ -373,7 +374,7 @@ internal constructor(
		override fun getClockViewFactory(activity: ComponentActivity): ClockViewFactory {
		val activityHashCode = activity.hashCode()
		return clockViewFactories[activityHashCode]
		?: ClockViewFactory(
		?: ClockViewFactoryImpl(
		activity.applicationContext,
		ScreenSizeCalculator.getInstance()
		.getScreenSize(activity.windowManager.defaultDisplay),

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

+65 −27

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.text.TextUtils
		import com.android.customization.model.color.ColorOption
		import com.android.customization.model.grid.GridOption
		import com.android.customization.module.SysUiStatsLogger
		import com.android.customization.module.logging.ThemesUserEventLogger.ClockSize
		import com.android.systemui.shared.system.SysUiStatsLog
		import com.android.wallpaper.module.WallpaperPersister.DEST_BOTH
		import com.android.wallpaper.module.WallpaperPersister.DEST_HOME_SCREEN
		@@ -37,18 +38,6 @@ import com.android.wallpaper.util.LaunchSourceUtils
		class StatsLogUserEventLogger(private val preferences: WallpaperPreferences) :
		NoOpUserEventLogger(), ThemesUserEventLogger {

		override fun logAppLaunched(launchSource: Intent) {
		SysUiStatsLogger(SysUiStatsLog.STYLE_UICHANGED__ACTION__APP_LAUNCHED)
		.setLaunchedPreference(getAppLaunchSource(launchSource))
		.log()
		}

		override fun logActionClicked(collectionId: String, actionLabelResId: Int) {
		SysUiStatsLogger(StyleEnums.WALLPAPER_EXPLORE)
		.setWallpaperCategoryHash(getIdHashCode(collectionId))
		.log()
		}

		override fun logSnapshot() {
		SysUiStatsLogger(StyleEnums.SNAPSHOT)
		.setWallpaperCategoryHash(preferences.getHomeCategoryHash())
		@@ -59,6 +48,12 @@ class StatsLogUserEventLogger(private val preferences: WallpaperPreferences) :
		.log()
		}

		override fun logAppLaunched(launchSource: Intent) {
		SysUiStatsLogger(StyleEnums.APP_LAUNCHED)
		.setLaunchedPreference(launchSource.getAppLaunchSource())
		.log()
		}

		override fun logWallpaperApplied(
		collectionId: String?,
		wallpaperId: String?,
		@@ -114,20 +109,69 @@ class StatsLogUserEventLogger(private val preferences: WallpaperPreferences) :
		.log()
		}

		override fun logColorApplied(action: Int, colorOption: ColorOption) {
		SysUiStatsLogger(action)
		override fun logResetApplied() {
		SysUiStatsLogger(StyleEnums.RESET_APPLIED).log()
		}

		override fun logWallpaperExploreButtonClicked() {
		SysUiStatsLogger(StyleEnums.WALLPAPER_EXPLORE).log()
		}

		override fun logThemeColorApplied(colorOption: ColorOption) {
		SysUiStatsLogger(StyleEnums.THEME_COLOR_APPLIED)
		.setColorPreference(colorOption.index)
		.setColorVariant(colorOption.style.ordinal + 1)
		.log()
		}

		override fun logGridApplied(grid: GridOption) {
		SysUiStatsLogger(StyleEnums.PICKER_APPLIED).setLauncherGrid(grid.cols).log()
		SysUiStatsLogger(StyleEnums.GRID_APPLIED).setLauncherGrid(grid.getLauncherGridInt()).log()
		}

		override fun logClockApplied(clockId: String) {
		SysUiStatsLogger(StyleEnums.CLOCK_APPLIED).setClockPackageHash(getIdHashCode(clockId)).log()
		}

		override fun logClockColorApplied(seedColor: Int) {
		SysUiStatsLogger(StyleEnums.CLOCK_COLOR_APPLIED).setSeedColor(seedColor).log()
		}

		override fun logClockSizeApplied(@ClockSize clockSize: Int) {
		SysUiStatsLogger(StyleEnums.CLOCK_SIZE_APPLIED).setClockSize(clockSize).log()
		}

		override fun logThemedIconApplied(useThemeIcon: Boolean) {
		SysUiStatsLogger(StyleEnums.THEMED_ICON_APPLIED).setToggleOn(useThemeIcon).log()
		}

		override fun logLockScreenNotificationApplied(showLockScreenNotifications: Boolean) {
		SysUiStatsLogger(StyleEnums.LOCK_SCREEN_NOTIFICATION_APPLIED)
		.setToggleOn(showLockScreenNotifications)
		.log()
		}

		override fun logShortcutApplied(shortcut: String, shortcutSlotId: String) {
		SysUiStatsLogger(StyleEnums.SHORTCUT_APPLIED)
		.setShortcut(shortcut)
		.setShortcutSlotId(shortcutSlotId)
		.log()
		}

		private fun getAppLaunchSource(launchSource: Intent): Int {
		return if (launchSource.hasExtra(LaunchSourceUtils.WALLPAPER_LAUNCH_SOURCE)) {
		when (launchSource.getStringExtra(LaunchSourceUtils.WALLPAPER_LAUNCH_SOURCE)) {
		override fun logDarkThemeApplied(useDarkTheme: Boolean) {
		SysUiStatsLogger(StyleEnums.DARK_THEME_APPLIED).setToggleOn(useDarkTheme).log()
		}

		/**
		* The grid integer depends on the column and row numbers. For example: 4x5 is 405 13x37 is 1337
		* The upper limit for the column / row count is 99.
		*/
		private fun GridOption.getLauncherGridInt(): Int {
		return cols * 100 + rows
		}

		private fun Intent.getAppLaunchSource(): Int {
		return if (hasExtra(LaunchSourceUtils.WALLPAPER_LAUNCH_SOURCE)) {
		when (getStringExtra(LaunchSourceUtils.WALLPAPER_LAUNCH_SOURCE)) {
		LaunchSourceUtils.LAUNCH_SOURCE_LAUNCHER ->
		SysUiStatsLog.STYLE_UICHANGED__LAUNCHED_PREFERENCE__LAUNCHED_LAUNCHER
		LaunchSourceUtils.LAUNCH_SOURCE_SETTINGS ->
		@@ -142,17 +186,11 @@ class StatsLogUserEventLogger(private val preferences: WallpaperPreferences) :
		SysUiStatsLog
		.STYLE_UICHANGED__LAUNCHED_PREFERENCE__LAUNCHED_PREFERENCE_UNSPECIFIED
		}
		} else if (launchSource.hasExtra(LaunchSourceUtils.LAUNCH_SETTINGS_SEARCH)) {
		} else if (hasExtra(LaunchSourceUtils.LAUNCH_SETTINGS_SEARCH)) {
		SysUiStatsLog.STYLE_UICHANGED__LAUNCHED_PREFERENCE__LAUNCHED_SETTINGS_SEARCH
		} else if (
		launchSource.action != null &&
		launchSource.action == WallpaperManager.ACTION_CROP_AND_SET_WALLPAPER
		) {
		} else if (action != null && action == WallpaperManager.ACTION_CROP_AND_SET_WALLPAPER) {
		SysUiStatsLog.STYLE_UICHANGED__LAUNCHED_PREFERENCE__LAUNCHED_CROP_AND_SET_ACTION
		} else if (
		launchSource.categories != null &&
		launchSource.categories.contains(Intent.CATEGORY_LAUNCHER)
		) {
		} else if (categories != null && categories.contains(Intent.CATEGORY_LAUNCHER)) {
		SysUiStatsLog.STYLE_UICHANGED__LAUNCHED_PREFERENCE__LAUNCHED_LAUNCH_ICON
		} else {
		SysUiStatsLog.STYLE_UICHANGED__LAUNCHED_PREFERENCE__LAUNCHED_PREFERENCE_UNSPECIFIED

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

+26 −7

Original line number	Diff line number	Diff line
		@@ -15,19 +15,38 @@
		*/
		package com.android.customization.module.logging

		import android.stats.style.StyleEnums
		import androidx.annotation.IntDef
		import com.android.customization.model.color.ColorOption
		import com.android.customization.model.grid.GridOption
		import com.android.wallpaper.module.logging.UserEventLogger

		/** Extension of [UserEventLogger] that adds ThemePicker specific events. */
		interface ThemesUserEventLogger : UserEventLogger {
		/**
		* Logs the color usage while color is applied.
		*
		* @param action color applied action.
		* @param colorOption applied color option.
		*/
		fun logColorApplied(action: Int, colorOption: ColorOption)

		fun logThemeColorApplied(colorOption: ColorOption)

		fun logGridApplied(grid: GridOption)

		fun logClockApplied(clockId: String)

		fun logClockColorApplied(seedColor: Int)

		fun logClockSizeApplied(@ClockSize clockSize: Int)

		fun logThemedIconApplied(useThemeIcon: Boolean)

		fun logLockScreenNotificationApplied(showLockScreenNotifications: Boolean)

		fun logShortcutApplied(shortcut: String, shortcutSlotId: String)

		fun logDarkThemeApplied(useDarkTheme: Boolean)

		@IntDef(
		StyleEnums.CLOCK_SIZE_UNSPECIFIED,
		StyleEnums.CLOCK_SIZE_DYNAMIC,
		StyleEnums.CLOCK_SIZE_SMALL,
		)
		@Retention(AnnotationRetention.SOURCE)
		annotation class ClockSize
		}

src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt

+11 −199

Original line number	Diff line number	Diff line
		@@ -15,226 +15,38 @@
		*/
		package com.android.customization.picker.clock.ui.view

		import android.app.WallpaperColors
		import android.app.WallpaperManager
		import android.content.Context
		import android.content.res.Resources
		import android.graphics.Point
		import android.graphics.Rect
		import android.view.View
		import android.widget.FrameLayout
		import androidx.annotation.ColorInt
		import androidx.core.text.util.LocalePreferences
		import androidx.lifecycle.LifecycleOwner
		import com.android.systemui.plugins.ClockController
		import com.android.systemui.plugins.WeatherData
		import com.android.systemui.shared.clocks.ClockRegistry
		import com.android.wallpaper.R
		import com.android.wallpaper.util.TimeUtils.TimeTicker
		import java.util.concurrent.ConcurrentHashMap

		/**
		* Provide reusable clock view and related util functions.
		*
		* @property screenSize The Activity or Fragment's window size.
		*/
		class ClockViewFactory(
		private val appContext: Context,
		val screenSize: Point,
		private val wallpaperManager: WallpaperManager,
		private val registry: ClockRegistry,
		) {
		private val resources = appContext.resources
		private val timeTickListeners: ConcurrentHashMap<Int, TimeTicker> = ConcurrentHashMap()
		private val clockControllers: HashMap<String, ClockController> = HashMap()
		private val smallClockFrames: HashMap<String, FrameLayout> = HashMap()
		interface ClockViewFactory {

		fun getController(clockId: String): ClockController {
		return clockControllers[clockId]
		?: initClockController(clockId).also { clockControllers[clockId] = it }
		}
		fun getController(clockId: String): ClockController

		/**
		* Reset the large view to its initial state when getting the view. This is because some view
		* configs, e.g. animation state, might change during the reuse of the clock view in the app.
		*/
		fun getLargeView(clockId: String): View {
		return getController(clockId).largeClock.let {
		it.animations.onPickerCarouselSwiping(1F)
		it.view
		}
		}
		fun getLargeView(clockId: String): View

		/**
		* Reset the small view to its initial state when getting the view. This is because some view
		* configs, e.g. translation X, might change during the reuse of the clock view in the app.
		*/
		fun getSmallView(clockId: String): View {
		val smallClockFrame =
		smallClockFrames[clockId]
		?: createSmallClockFrame().also {
		it.addView(getController(clockId).smallClock.view)
		smallClockFrames[clockId] = it
		}
		smallClockFrame.translationX = 0F
		smallClockFrame.translationY = 0F
		return smallClockFrame
		}

		private fun createSmallClockFrame(): FrameLayout {
		val smallClockFrame = FrameLayout(appContext)
		val layoutParams =
		FrameLayout.LayoutParams(
		FrameLayout.LayoutParams.WRAP_CONTENT,
		resources.getDimensionPixelSize(R.dimen.small_clock_height)
		)
		layoutParams.topMargin = getSmallClockTopMargin()
		layoutParams.marginStart = getSmallClockStartPadding()
		smallClockFrame.layoutParams = layoutParams
		smallClockFrame.clipChildren = false
		return smallClockFrame
		}

		private fun getSmallClockTopMargin() =
		getStatusBarHeight(appContext.resources) +
		appContext.resources.getDimensionPixelSize(R.dimen.small_clock_padding_top)

		private fun getSmallClockStartPadding() =
		appContext.resources.getDimensionPixelSize(R.dimen.clock_padding_start)

		fun updateColorForAllClocks(@ColorInt seedColor: Int?) {
		clockControllers.values.forEach { it.events.onSeedColorChanged(seedColor = seedColor) }
		}

		fun updateColor(clockId: String, @ColorInt seedColor: Int?) {
		clockControllers[clockId]?.events?.onSeedColorChanged(seedColor)
		}

		fun updateRegionDarkness() {
		val isRegionDark = isLockscreenWallpaperDark()
		clockControllers.values.forEach {
		it.largeClock.events.onRegionDarknessChanged(isRegionDark)
		it.smallClock.events.onRegionDarknessChanged(isRegionDark)
		}
		}

		private fun isLockscreenWallpaperDark(): Boolean {
		val colors = wallpaperManager.getWallpaperColors(WallpaperManager.FLAG_LOCK)
		return (colors?.colorHints?.and(WallpaperColors.HINT_SUPPORTS_DARK_TEXT)) == 0
		}

		fun updateTimeFormat(clockId: String) {
		getController(clockId)
		.events
		.onTimeFormatChanged(android.text.format.DateFormat.is24HourFormat(appContext))
		}
		fun getSmallView(clockId: String): View

		fun registerTimeTicker(owner: LifecycleOwner) {
		val hashCode = owner.hashCode()
		if (timeTickListeners.keys.contains(hashCode)) {
		return
		}

		timeTickListeners[hashCode] = TimeTicker.registerNewReceiver(appContext) { onTimeTick() }
		}

		fun onDestroy() {
		timeTickListeners.forEach { (_, timeTicker) -> appContext.unregisterReceiver(timeTicker) }
		timeTickListeners.clear()
		clockControllers.clear()
		smallClockFrames.clear()
		}

		private fun onTimeTick() {
		clockControllers.values.forEach {
		it.largeClock.events.onTimeTick()
		it.smallClock.events.onTimeTick()
		}
		}
		fun updateColorForAllClocks(@ColorInt seedColor: Int?)

		fun unregisterTimeTicker(owner: LifecycleOwner) {
		val hashCode = owner.hashCode()
		timeTickListeners[hashCode]?.let {
		appContext.unregisterReceiver(it)
		timeTickListeners.remove(hashCode)
		}
		}
		fun updateColor(clockId: String, @ColorInt seedColor: Int?)

		private fun initClockController(clockId: String): ClockController {
		val controller =
		registry.createExampleClock(clockId).also { it?.initialize(resources, 0f, 0f) }
		checkNotNull(controller)
		fun updateRegionDarkness()

		val isWallpaperDark = isLockscreenWallpaperDark()
		// Initialize large clock
		controller.largeClock.events.onRegionDarknessChanged(isWallpaperDark)
		controller.largeClock.events.onFontSettingChanged(
		resources.getDimensionPixelSize(R.dimen.large_clock_text_size).toFloat()
		)
		controller.largeClock.events.onTargetRegionChanged(getLargeClockRegion())
		fun updateTimeFormat(clockId: String)

		// Initialize small clock
		controller.smallClock.events.onRegionDarknessChanged(isWallpaperDark)
		controller.smallClock.events.onFontSettingChanged(
		resources.getDimensionPixelSize(R.dimen.small_clock_text_size).toFloat()
		)
		controller.smallClock.events.onTargetRegionChanged(getSmallClockRegion())
		fun registerTimeTicker(owner: LifecycleOwner)

		// Use placeholder for weather clock preview in picker.
		// Use locale default temp unit since assistant default is not available in this context.
		val useCelsius =
		LocalePreferences.getTemperatureUnit() == LocalePreferences.TemperatureUnit.CELSIUS
		controller.events.onWeatherDataChanged(
		WeatherData(
		description = DESCRIPTION_PLACEHODLER,
		state = WEATHERICON_PLACEHOLDER,
		temperature =
		if (useCelsius) TEMPERATURE_CELSIUS_PLACEHOLDER
		else TEMPERATURE_FAHRENHEIT_PLACEHOLDER,
		useCelsius = useCelsius,
		)
		)
		return controller
		}
		fun onDestroy()

		/**
		* Simulate the function of getLargeClockRegion in KeyguardClockSwitch so that we can get a
		* proper region corresponding to lock screen in picker and for onTargetRegionChanged to scale
		* and position the clock view
		*/
		private fun getLargeClockRegion(): Rect {
		val largeClockTopMargin =
		resources.getDimensionPixelSize(R.dimen.keyguard_large_clock_top_margin)
		val targetHeight = resources.getDimensionPixelSize(R.dimen.large_clock_text_size) * 2
		val top = (screenSize.y / 2 - targetHeight / 2 + largeClockTopMargin / 2)
		return Rect(0, top, screenSize.x, (top + targetHeight))
		}

		/**
		* Simulate the function of getSmallClockRegion in KeyguardClockSwitch so that we can get a
		* proper region corresponding to lock screen in picker and for onTargetRegionChanged to scale
		* and position the clock view
		*/
		private fun getSmallClockRegion(): Rect {
		val topMargin = getSmallClockTopMargin()
		val targetHeight = resources.getDimensionPixelSize(R.dimen.small_clock_height)
		return Rect(getSmallClockStartPadding(), topMargin, screenSize.x, topMargin + targetHeight)
		}

		companion object {
		const val DESCRIPTION_PLACEHODLER = ""
		const val TEMPERATURE_FAHRENHEIT_PLACEHOLDER = 58
		const val TEMPERATURE_CELSIUS_PLACEHOLDER = 21
		val WEATHERICON_PLACEHOLDER = WeatherData.WeatherStateIcon.MOSTLY_SUNNY
		const val USE_CELSIUS_PLACEHODLER = false

		private fun getStatusBarHeight(resource: Resources): Int {
		var result = 0
		val resourceId: Int = resource.getIdentifier("status_bar_height", "dimen", "android")
		if (resourceId > 0) {
		result = resource.getDimensionPixelSize(resourceId)
		}
		return result
		}
		}
		fun unregisterTimeTicker(owner: LifecycleOwner)
		}

src/com/android/customization/picker/clock/ui/view/ClockViewFactoryImpl.kt

0 → 100644

+240 −0

File added.

Preview size limit exceeded, changes collapsed.