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

Commit e5b4fe8a authored by Lucas Silva's avatar Lucas Silva
Browse files

Fix lock icon background when exiting hub 

When exiting hub, ensure we reset the device entry icon background.

Fixes: 397570515
Test: locally on device by entering/exiting hub
Flag: EXEMPT bugfix
Change-Id: Ie4cb841d3e72975414bb013c0538883833136028
parent 33746bcb

packages/SystemUI/src/com/android/systemui/keyguard/ui/transitions/DeviceEntryIconTransitionModule.kt

+7 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.systemui.keyguard.ui.viewmodel.DreamingToGlanceableHubTransit 
import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel

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

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

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

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

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

import com.android.systemui.keyguard.ui.viewmodel.GoneToDozingTransitionViewModel
@@ -270,6 +271,12 @@ abstract class DeviceEntryIconTransitionModule { 
        impl: GlanceableHubToAodTransitionViewModel

    ): DeviceEntryIconTransition



    @Binds

    @IntoSet

    abstract fun glanceableHubToLockscreen(

        impl: GlanceableHubToLockscreenTransitionViewModel

    ): DeviceEntryIconTransition



    @Binds

    @IntoSet

    abstract fun occludedToGlanceableHub(

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

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ constructor( 
    primaryBouncerToLockscreenTransitionViewModel: PrimaryBouncerToLockscreenTransitionViewModel,

    lockscreenToDozingTransitionViewModel: LockscreenToDozingTransitionViewModel,

    glanceableHubToAodTransitionViewModel: GlanceableHubToAodTransitionViewModel,

    glanceableHubToLockscreenTransitionViewModel: GlanceableHubToLockscreenTransitionViewModel,

) {

    val color: Flow<Int> =

        deviceEntryIconViewModel.useBackgroundProtection.flatMapLatest { useBackground ->
@@ -108,6 +109,7 @@ constructor( 
                            .deviceEntryBackgroundViewAlpha,

                        lockscreenToDozingTransitionViewModel.deviceEntryBackgroundViewAlpha,

                        glanceableHubToAodTransitionViewModel.deviceEntryBackgroundViewAlpha,

                        glanceableHubToLockscreenTransitionViewModel.deviceEntryBackgroundViewAlpha,

                    )

                    .merge()

                    .onStart {

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

+6 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.systemui.keyguard.shared.model.KeyguardState.GLANCEABLE_HUB 
import com.android.systemui.keyguard.shared.model.KeyguardState.LOCKSCREEN

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

import com.android.systemui.keyguard.ui.StateToValue

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

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

import com.android.systemui.res.R

import com.android.systemui.scene.shared.model.Scenes
@@ -49,7 +50,7 @@ constructor( 
    @ShadeDisplayAware configurationInteractor: ConfigurationInteractor,

    animationFlow: KeyguardTransitionAnimationFlow,

    private val blurFactory: GlanceableHubBlurComponent.Factory,

) : GlanceableHubTransition {

) : GlanceableHubTransition, DeviceEntryIconTransition {

    private val transitionAnimation =

        animationFlow

            .setup(
@@ -102,4 +103,8 @@ constructor( 


    val notificationTranslationX: Flow<Float> =

        keyguardTranslationX.map { it.value }.filterNotNull()



    val deviceEntryBackgroundViewAlpha: Flow<Float> = keyguardAlpha



    override val deviceEntryParentViewAlpha: Flow<Float> = keyguardAlpha

}

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

+1 −0
Original line number Diff line number Diff line
@@ -48,5 +48,6 @@ val Kosmos.deviceEntryBackgroundViewModel by Fixture { 
            primaryBouncerToLockscreenTransitionViewModel,

        lockscreenToDozingTransitionViewModel = lockscreenToDozingTransitionViewModel,

        glanceableHubToAodTransitionViewModel = glanceableHubToAodTransitionViewModel,

        glanceableHubToLockscreenTransitionViewModel = glanceableHubToLockscreenTransitionViewModel,

    )

}