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

Commit 1f3ac68e authored by Coco Duan's avatar Coco Duan Committed by William Xiao
Browse files

Lockscreen wallpaper is blurred after switching back from Hub 

The window remains blurred after transitioning from Hub to AOD and then
returning to lockscreen. Fix is to add the exit blur flow to the ViewModel.

Also fixes that after AOD->Hub, the hub's background isn't blurred when
it should be. It's because we forgot to bind the view model in the hub
transition module.

Fixes: 419426901
Test: atest GlanceableHubToAodTransitionViewModelTest
Test: atest AodToGlanceableHubTransitionViewModelTest
Flag: com.android.systemui.glanceable_hub_blurred_background
Change-Id: I3c5dc99dc4697121bfd8c1da6cd5b5dfce71d699
parent 1e3e76ae

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/AodToGlanceableHubTransitionViewModelTest.kt

0 → 100644
+68 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.keyguard.ui.viewmodel



import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.common.ui.data.repository.fakeConfigurationRepository

import com.android.systemui.flags.DisableSceneContainer

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

import com.android.systemui.keyguard.shared.model.KeyguardState

import com.android.systemui.keyguard.shared.model.TransitionStep

import com.android.systemui.keyguard.ui.transitions.blurConfig

import com.android.systemui.kosmos.collectValues

import com.android.systemui.kosmos.runTest

import com.android.systemui.kosmos.testScope

import com.android.systemui.testKosmos

import org.junit.Test

import org.junit.runner.RunWith



@SmallTest

@DisableSceneContainer

@RunWith(AndroidJUnit4::class)

class AodToGlanceableHubTransitionViewModelTest : SysuiTestCase() {

    val kosmos = testKosmos()

    val testScope = kosmos.testScope



    val keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository

    val configurationRepository = kosmos.fakeConfigurationRepository

    val underTest by lazy { kosmos.aodToGlanceableHubTransitionViewModel }



    @Test

    fun blurBecomesMaxValueImmediately() =

        kosmos.runTest {

            val values by collectValues(underTest.windowBlurRadius)



            keyguardWindowBlurTestUtil.assertTransitionToBlurRadius(

                transitionProgress = listOf(0.0f, 0.2f, 0.3f, 0.6f, 0.7f, 1.0f),

                startValue = blurConfig.minBlurRadiusPx,

                endValue = blurConfig.maxBlurRadiusPx,

                actualValuesProvider = { values },

                transitionFactory = { step, transitionState ->

                    TransitionStep(

                        from = KeyguardState.AOD,

                        to = KeyguardState.GLANCEABLE_HUB,

                        value = step,

                        transitionState = transitionState,

                        ownerName = "AodToGlanceableHubTransitionViewModelTest",

                    )

                },

                checkInterpolatedValues = false,

            )

        }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/GlanceableHubToAodTransitionViewModelTest.kt

0 → 100644
+68 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.keyguard.ui.viewmodel



import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.common.ui.data.repository.fakeConfigurationRepository

import com.android.systemui.flags.DisableSceneContainer

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

import com.android.systemui.keyguard.shared.model.KeyguardState

import com.android.systemui.keyguard.shared.model.TransitionStep

import com.android.systemui.keyguard.ui.transitions.blurConfig

import com.android.systemui.kosmos.collectValues

import com.android.systemui.kosmos.runTest

import com.android.systemui.kosmos.testScope

import com.android.systemui.testKosmos

import org.junit.Test

import org.junit.runner.RunWith



@SmallTest

@DisableSceneContainer

@RunWith(AndroidJUnit4::class)

class GlanceableHubToAodTransitionViewModelTest : SysuiTestCase() {

    val kosmos = testKosmos()

    val testScope = kosmos.testScope



    val keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository

    val configurationRepository = kosmos.fakeConfigurationRepository

    val underTest by lazy { kosmos.glanceableHubToAodTransitionViewModel }



    @Test

    fun blurBecomesMinValueImmediately() =

        kosmos.runTest {

            val values by collectValues(underTest.windowBlurRadius)



            keyguardWindowBlurTestUtil.assertTransitionToBlurRadius(

                transitionProgress = listOf(0.0f, 0.2f, 0.3f, 0.6f, 0.7f, 1.0f),

                startValue = blurConfig.maxBlurRadiusPx,

                endValue = blurConfig.minBlurRadiusPx,

                actualValuesProvider = { values },

                transitionFactory = { step, transitionState ->

                    TransitionStep(

                        from = KeyguardState.GLANCEABLE_HUB,

                        to = KeyguardState.AOD,

                        value = step,

                        transitionState = transitionState,

                        ownerName = "GlanceableHubToAodTransitionViewModelTest",

                    )

                },

                checkInterpolatedValues = false,

            )

        }

}

packages/SystemUI/src/com/android/systemui/keyguard/dagger/GlanceableHubTransitionModule.kt

+8 −0
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@ 
package com.android.systemui.keyguard.dagger



import com.android.systemui.keyguard.ui.transitions.GlanceableHubTransition

import com.android.systemui.keyguard.ui.viewmodel.AodToGlanceableHubTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.DozingToGlanceableHubTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.DreamingToGlanceableHubTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.GlanceableHubToAodTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.GlanceableHubToDozingTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.GlanceableHubToDreamingTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.GlanceableHubToEditModeTransitionViewModel
@@ -72,6 +74,12 @@ interface GlanceableHubTransitionImplModule { 
    @IntoSet

    fun toDozing(impl: GlanceableHubToDozingTransitionViewModel): GlanceableHubTransition



    @Binds

    @IntoSet

    fun fromAod(impl: AodToGlanceableHubTransitionViewModel): GlanceableHubTransition



    @Binds @IntoSet fun toAod(impl: GlanceableHubToAodTransitionViewModel): GlanceableHubTransition



    @Binds

    @IntoSet

    fun toEditMode(impl: GlanceableHubToEditModeTransitionViewModel): GlanceableHubTransition

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/GlanceableHubToAodTransitionViewModel.kt

+7 −1
Original line number Diff line number Diff line
@@ -18,12 +18,14 @@ package com.android.systemui.keyguard.ui.viewmodel 


import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.deviceentry.domain.interactor.DeviceEntryUdfpsInteractor

import com.android.systemui.keyguard.dagger.GlanceableHubBlurComponent

import com.android.systemui.keyguard.domain.interactor.FromGlanceableHubTransitionInteractor

import com.android.systemui.keyguard.shared.model.Edge

import com.android.systemui.keyguard.shared.model.KeyguardState

import com.android.systemui.keyguard.shared.model.KeyguardState.AOD

import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow

import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition

import com.android.systemui.keyguard.ui.transitions.GlanceableHubTransition

import com.android.systemui.scene.shared.model.Scenes

import javax.inject.Inject

import kotlin.time.Duration.Companion.milliseconds
@@ -39,7 +41,8 @@ class GlanceableHubToAodTransitionViewModel 
constructor(

    deviceEntryUdfpsInteractor: DeviceEntryUdfpsInteractor,

    animationFlow: KeyguardTransitionAnimationFlow,

) : DeviceEntryIconTransition {

    blurComponentFactory: GlanceableHubBlurComponent.Factory,

) : DeviceEntryIconTransition, GlanceableHubTransition {



    private val transitionAnimation =

        animationFlow
@@ -80,4 +83,7 @@ constructor( 
                emptyFlow()

            }

        }



    override val windowBlurRadius: Flow<Float> =

        blurComponentFactory.create(transitionAnimation).getBlurProvider().exitBlurRadius

}

packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/GlanceableHubToAodTransitionViewModelKosmos.kt

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.keyguard.ui.viewmodel



import com.android.systemui.deviceentry.domain.interactor.deviceEntryUdfpsInteractor

import com.android.systemui.keyguard.ui.glanceableHubBlurComponentFactory

import com.android.systemui.keyguard.ui.keyguardTransitionAnimationFlow

import com.android.systemui.kosmos.Kosmos
@@ -25,5 +26,6 @@ val Kosmos.glanceableHubToAodTransitionViewModel by 
        GlanceableHubToAodTransitionViewModel(

            deviceEntryUdfpsInteractor = deviceEntryUdfpsInteractor,

            animationFlow = keyguardTransitionAnimationFlow,

            blurComponentFactory = glanceableHubBlurComponentFactory,

        )

    }