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

Commit 0392546f authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12551711 from 3ca05d5d to 25Q1-release 

Change-Id: I81010eeb45e7f7083959c7031ad924f23044e726
parents df9943ab 3ca05d5d

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

+12 −8
Original line number Diff line number Diff line
@@ -122,18 +122,24 @@ constructor( 
        )



    override fun updateColorForAllClocks(@ColorInt seedColor: Int?) {

        clockControllers.values.forEach { it.events.onSeedColorChanged(seedColor = seedColor) }

        clockControllers.values.forEach {

            it.largeClock.run { events.onThemeChanged(theme.copy(seedColor = seedColor)) }

            it.smallClock.run { events.onThemeChanged(theme.copy(seedColor = seedColor)) }

        }

    }



    override fun updateColor(clockId: String, @ColorInt seedColor: Int?) {

        getController(clockId).events.onSeedColorChanged(seedColor)

        getController(clockId).let {

            it.largeClock.run { events.onThemeChanged(theme.copy(seedColor = seedColor)) }

            it.smallClock.run { events.onThemeChanged(theme.copy(seedColor = seedColor)) }

        }

    }



    override fun updateRegionDarkness() {

        val isRegionDark = isLockscreenWallpaperDark()

        clockControllers.values.forEach {

            it.largeClock.events.onRegionDarknessChanged(isRegionDark)

            it.smallClock.events.onRegionDarknessChanged(isRegionDark)

            it.largeClock.run { events.onThemeChanged(theme.copy(isDarkTheme = isRegionDark)) }

            it.smallClock.run { events.onThemeChanged(theme.copy(isDarkTheme = isRegionDark)) }

        }

    }
@@ -180,13 +186,12 @@ constructor( 
    }



    private fun initClockController(clockId: String): ClockController {

        val isWallpaperDark = isLockscreenWallpaperDark()

        val controller =

            registry.createExampleClock(clockId).also { it?.initialize(resources, 0f, 0f) }

            registry.createExampleClock(clockId).also { it?.initialize(isWallpaperDark, 0f, 0f) }

        checkNotNull(controller)



        val isWallpaperDark = isLockscreenWallpaperDark()

        // Initialize large clock

        controller.largeClock.events.onRegionDarknessChanged(isWallpaperDark)

        controller.largeClock.events.onFontSettingChanged(

            resources

                .getDimensionPixelSize(
@@ -197,7 +202,6 @@ constructor( 
        controller.largeClock.events.onTargetRegionChanged(getLargeClockRegion())



        // Initialize small clock

        controller.smallClock.events.onRegionDarknessChanged(isWallpaperDark)

        controller.smallClock.events.onFontSettingChanged(

            resources

                .getDimensionPixelSize(

tests/robotests/src/com/android/customization/picker/clock/ui/FakeClockViewFactory.kt

+1 −2
Original line number Diff line number Diff line 
package com.android.customization.picker.clock.ui



import android.content.res.Resources

import android.view.View

import androidx.lifecycle.LifecycleOwner

import com.android.customization.picker.clock.data.repository.FakeClockPickerRepository
@@ -29,7 +28,7 @@ class FakeClockViewFactory @Inject constructor() : ClockViewFactory { 
        override val events: ClockEvents

            get() = TODO("Not yet implemented")



        override fun initialize(resources: Resources, dozeFraction: Float, foldFraction: Float) =

        override fun initialize(isDarkTheme: Boolean, dozeFraction: Float, foldFraction: Float) =

            TODO("Not yet implemented")



        override fun dump(pw: PrintWriter) = TODO("Not yet implemented")