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

Commit a97ac584 authored by Brad Hinegardner's avatar Brad Hinegardner
Browse files

Prevent small date weather from flicking when on large clock 

We shouldn't add then immediately remove the small
date/weather from the burn-in layer.

Bug: 406740285
Test: manual
Flag: com.android.systemui.shared.clock_reactive_smartspace_layout
Change-Id: I4d186976f7ef8021376504c98701832f9e16314c
parent 16195929

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardBlueprintInteractorTest.kt

+0 −9
Original line number Diff line number Diff line
@@ -27,17 +27,13 @@ import com.android.systemui.common.ui.data.repository.fakeConfigurationRepositor 
import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.flags.DisableSceneContainer

import com.android.systemui.flags.EnableSceneContainer

import com.android.systemui.keyguard.data.repository.fakeKeyguardClockRepository

import com.android.systemui.keyguard.data.repository.keyguardBlueprintRepository

import com.android.systemui.keyguard.ui.view.layout.blueprints.DefaultKeyguardBlueprint

import com.android.systemui.keyguard.ui.view.layout.blueprints.SplitShadeKeyguardBlueprint

import com.android.systemui.kosmos.testScope

import com.android.systemui.plugins.clocks.ClockConfig

import com.android.systemui.plugins.clocks.ClockController

import com.android.systemui.shade.data.repository.shadeRepository

import com.android.systemui.testKosmos

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.whenever

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.test.advanceUntilIdle

import kotlinx.coroutines.test.runCurrent
@@ -45,7 +41,6 @@ import kotlinx.coroutines.test.runTest 
import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mock

import org.mockito.Mockito.reset

import org.mockito.Mockito.times

import org.mockito.Mockito.verify
@@ -58,16 +53,12 @@ class KeyguardBlueprintInteractorTest : SysuiTestCase() { 
    private val testScope = kosmos.testScope

    private val underTest by lazy { kosmos.keyguardBlueprintInteractor }

    private val keyguardBlueprintRepository by lazy { kosmos.keyguardBlueprintRepository }

    private val clockRepository by lazy { kosmos.fakeKeyguardClockRepository }

    private val configurationRepository by lazy { kosmos.fakeConfigurationRepository }

    private val fingerprintPropertyRepository by lazy { kosmos.fakeFingerprintPropertyRepository }



    @Mock private lateinit var clockController: ClockController



    @Before

    fun setup() {

        MockitoAnnotations.initMocks(this)

        whenever(clockController.config).thenReturn(ClockConfig("TEST", "Test", ""))

        fingerprintPropertyRepository.setProperties(

            sensorId = 1,

            strength = SensorStrength.STRONG,

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSmartspaceViewBinder.kt

+21 −8
Original line number Diff line number Diff line
@@ -53,11 +53,13 @@ object KeyguardSmartspaceViewBinder { 
                            ::Pair,

                        )

                        .collect {

                            if (!com.android.systemui.shared.Flags.clockReactiveSmartspaceLayout()) {

                                updateDateWeatherToBurnInLayer(

                                    keyguardRootView,

                                    clockViewModel,

                                    smartspaceViewModel,

                                )

                            }

                            blueprintInteractor.refreshBlueprint(

                                Config(

                                    Type.SmartspaceVisibility,
@@ -99,15 +101,26 @@ object KeyguardSmartspaceViewBinder { 
                        combine(

                                keyguardRootViewModel.burnInLayerVisibility,

                                clockViewModel.isLargeClockVisible,

                                ::Pair,

                                clockViewModel.hasCustomWeatherDataDisplay,

                                ::Triple,

                            )

                            .collect { (visibility, isLargeClock) ->

                                if (isLargeClock) {

                            .collect { (visibility, isLargeClock, hasCustomWeatherDataDisplay) ->

                                if (isLargeClock || hasCustomWeatherDataDisplay) {

                                    // hide small clock date/weather

                                    keyguardRootView.findViewById<View>(smallViewId)?.let {

                                        it.visibility = View.GONE

                                    }

                                    removeDateWeatherFromBurnInLayer(

                                        keyguardRootView,

                                        smartspaceViewModel,

                                    )

                                } else {

                                    addDateWeatherToBurnInLayer(

                                        keyguardRootView,

                                        smartspaceViewModel,

                                    )

                                }

                                clockViewModel.burnInLayer?.updatePostLayout(keyguardRootView)

                            }

                    }