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

Commit acbf3a51 authored by Darrell Shi's avatar Darrell Shi
Browse files

Window blur during hub and edit mode transition 

This change introduces a new transition view model for the glanceable
hub and edit mode transition. Because the window blur is covered by a
background that SystemUI applies during the transitions, it only needs
to snap to the correct value according to the current edit mode state.

Test: atest GlanceableHubToEditModeTransitionViewModelTest
Bug: 419361764
Flag: com.android.systemui.hub_edit_mode_transition
Change-Id: I505d36b0d673614ce063278d638d39956b8ad4f0
parent 3a5b6545

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

0 → 100644
+136 −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 android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

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

import androidx.test.filters.SmallTest

import com.android.systemui.Flags.FLAG_HUB_EDIT_MODE_TRANSITION

import com.android.systemui.SysuiTestCase

import com.android.systemui.communal.domain.interactor.communalSceneInteractor

import com.android.systemui.communal.shared.model.EditModeState

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

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.collectLastValue

import com.android.systemui.kosmos.runCurrent

import com.android.systemui.kosmos.runTest

import com.android.systemui.testKosmos

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

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith



@SmallTest

@RunWith(AndroidJUnit4::class)

class GlanceableHubToEditModeTransitionViewModelTest : SysuiTestCase() {

    val kosmos = testKosmos()

    val blurConfig = BlurConfig(minBlurRadiusPx = 0f, maxBlurRadiusPx = 100f)



    lateinit var underTest: GlanceableHubToEditModeTransitionViewModel



    @Before

    fun setUp() {

        underTest =

            GlanceableHubToEditModeTransitionViewModel(blurConfig, kosmos.communalSceneInteractor)

    }



    @EnableFlags(FLAG_HUB_EDIT_MODE_TRANSITION)

    @Test

    fun testWindowBlurRadius_doesNotEmitUntilValueChanges() =

        with(kosmos) {

            runTest {

                val windowBlurRadius by collectLastValue(underTest.windowBlurRadius)

                assertThat(windowBlurRadius).isNull()



                setEditModeState(null)

                assertThat(windowBlurRadius).isNull()



                setEditModeState(EditModeState.STARTING)

                assertThat(windowBlurRadius).isNull()



                setEditModeState(EditModeState.CREATED)

                assertThat(windowBlurRadius).isNull()



                setEditModeState(EditModeState.READY_TO_SHOW)

                assertThat(windowBlurRadius).isEqualTo(0f)

            }

        }



    @EnableFlags(FLAG_HUB_EDIT_MODE_TRANSITION)

    @Test

    fun testWindowBlurRadius_minBlurWhenEditModeIsShowing() =

        with(kosmos) {

            runTest {

                val windowBlurRadius by collectLastValue(underTest.windowBlurRadius)

                // Set edit mode state as showing as part of the set up just to get the flow started

                setEditModeState(EditModeState.SHOWING)



                setEditModeState(null)

                assertThat(windowBlurRadius).isEqualTo(100f)



                setEditModeState(EditModeState.STARTING)

                assertThat(windowBlurRadius).isEqualTo(100f)



                setEditModeState(EditModeState.CREATED)

                assertThat(windowBlurRadius).isEqualTo(100f)



                // Edit mode is ready to show, snap the blur down to minimum.

                setEditModeState(EditModeState.READY_TO_SHOW)

                assertThat(windowBlurRadius).isEqualTo(0f)



                setEditModeState(EditModeState.SHOWING)

                assertThat(windowBlurRadius).isEqualTo(0f)



                setEditModeState(null)

                assertThat(windowBlurRadius).isEqualTo(100f)

            }

        }



    @DisableFlags(FLAG_HUB_EDIT_MODE_TRANSITION)

    @Test

    fun testWindowBlurRadius_flagDisabled_doesNotEmit() =

        with(kosmos) {

            runTest {

                val windowBlurRadius by collectLastValue(underTest.windowBlurRadius)

                assertThat(windowBlurRadius).isNull()



                setEditModeState(null)

                assertThat(windowBlurRadius).isNull()



                setEditModeState(EditModeState.STARTING)

                assertThat(windowBlurRadius).isNull()



                setEditModeState(EditModeState.CREATED)

                assertThat(windowBlurRadius).isNull()



                setEditModeState(EditModeState.READY_TO_SHOW)

                assertThat(windowBlurRadius).isNull()



                setEditModeState(EditModeState.SHOWING)

                assertThat(windowBlurRadius).isNull()



                setEditModeState(null)

                assertThat(windowBlurRadius).isNull()

            }

        }



    private fun Kosmos.setEditModeState(state: EditModeState?) {

        communalSceneInteractor.setEditModeState(state)

        runCurrent()

    }

}

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

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import com.android.systemui.keyguard.ui.viewmodel.DozingToGlanceableHubTransitio 
import com.android.systemui.keyguard.ui.viewmodel.DreamingToGlanceableHubTransitionViewModel

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

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

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

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

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

import com.android.systemui.keyguard.ui.viewmodel.LockscreenToGlanceableHubTransitionViewModel
@@ -70,4 +71,8 @@ interface GlanceableHubTransitionImplModule { 
    @Binds

    @IntoSet

    fun toDozing(impl: GlanceableHubToDozingTransitionViewModel): GlanceableHubTransition



    @Binds

    @IntoSet

    fun toEditMode(impl: GlanceableHubToEditModeTransitionViewModel): GlanceableHubTransition

}

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

0 → 100644
+57 −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 com.android.systemui.Flags.hubEditModeTransition

import com.android.systemui.communal.domain.interactor.CommunalSceneInteractor

import com.android.systemui.communal.shared.model.EditModeState

import com.android.systemui.dagger.SysUISingleton

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

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

import javax.inject.Inject

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.distinctUntilChanged

import kotlinx.coroutines.flow.drop

import kotlinx.coroutines.flow.emptyFlow

import kotlinx.coroutines.flow.map



@SysUISingleton

class GlanceableHubToEditModeTransitionViewModel

@Inject

constructor(blurConfig: BlurConfig, communalSceneInteractor: CommunalSceneInteractor) :

    GlanceableHubTransition {



    override val windowBlurRadius: Flow<Float> =

        if (hubEditModeTransition()) {

            communalSceneInteractor.editModeState

                // Apply window blur when edit mode is not showing, and remove the blur immediately

                // when the edit mode activity is ready to show. No transition is needed because

                // SystemUI applies an opague background that covers the views below.

                .map { editModeState ->

                    if (editModeState == null || editModeState < EditModeState.READY_TO_SHOW) {

                        blurConfig.maxBlurRadiusPx

                    } else {

                        blurConfig.minBlurRadiusPx

                    }

                }

                .distinctUntilChanged()

                // Emit only when the blur radius changes

                .drop(1)

        } else {

            emptyFlow()

        }

}