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

Commit 65ca2d55 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Blur the notification scrim when we open the scrimmed bouncer from shade" into main

parents 3bd20adc 44ab2078

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

+2 −2
Original line number Diff line number Diff line
@@ -123,8 +123,8 @@ class AlternateBouncerToPrimaryBouncerTransitionViewModelTest : SysuiTestCase() 


            kosmos.keyguardWindowBlurTestUtil.assertTransitionToBlurRadius(

                transitionProgress = listOf(0f, 0f, 0.1f, 0.2f, 0.3f, 1f),

                startValue = kosmos.blurConfig.maxBlurRadiusPx / 3.0f,

                endValue = kosmos.blurConfig.maxBlurRadiusPx / 3.0f,

                startValue = kosmos.blurConfig.maxBlurRadiusPx,

                endValue = kosmos.blurConfig.maxBlurRadiusPx,

                transitionFactory = ::step,

                actualValuesProvider = { values },

                checkInterpolatedValues = false,

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

+2 −2
Original line number Diff line number Diff line
@@ -198,8 +198,8 @@ class LockscreenToPrimaryBouncerTransitionViewModelTest(flags: FlagsParameteriza 


            kosmos.keyguardWindowBlurTestUtil.assertTransitionToBlurRadius(

                transitionProgress = listOf(0f, 0f, 0.1f, 0.2f, 0.3f, 1f),

                startValue = kosmos.blurConfig.maxBlurRadiusPx / 3.0f,

                endValue = kosmos.blurConfig.maxBlurRadiusPx / 3.0f,

                startValue = kosmos.blurConfig.maxBlurRadiusPx,

                endValue = kosmos.blurConfig.maxBlurRadiusPx,

                transitionFactory = ::step,

                actualValuesProvider = { values },

                checkInterpolatedValues = false,

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

+0 −6
Original line number Diff line number Diff line
@@ -23,10 +23,4 @@ data class BlurConfig(val minBlurRadiusPx: Float, val maxBlurRadiusPx: Float) { 
    // No-op config that will be used by dagger of other SysUI variants which don't blur the

    // background surface.

    @Inject constructor() : this(0.0f, 0.0f)



    companion object {

        // Blur the shade much lesser than the background surface so that the surface is

        // distinguishable from the background.

        @JvmStatic fun Float.maxBlurRadiusToNotificationPanelBlurRadius(): Float = this / 3.0f

    }

}

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

+1 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import com.android.systemui.keyguard.shared.model.KeyguardState.ALTERNATE_BOUNCE 
import com.android.systemui.keyguard.shared.model.KeyguardState.PRIMARY_BOUNCER

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

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

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

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

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

import com.android.systemui.scene.shared.flag.SceneContainerFlag
@@ -89,9 +88,7 @@ constructor( 
            shadeDependentFlows.transitionFlow(

                flowWhenShadeIsNotExpanded = emptyFlow(),

                flowWhenShadeIsExpanded =

                    transitionAnimation.immediatelyTransitionTo(

                        blurConfig.maxBlurRadiusPx.maxBlurRadiusToNotificationPanelBlurRadius()

                    ),

                    transitionAnimation.immediatelyTransitionTo(blurConfig.maxBlurRadiusPx),

            )

        } else {

            emptyFlow<Float>()

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

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

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

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

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

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

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

import com.android.systemui.scene.shared.flag.SceneContainerFlag
@@ -88,9 +87,7 @@ constructor( 
            shadeDependentFlows.transitionFlow(

                flowWhenShadeIsNotExpanded = emptyFlow(),

                flowWhenShadeIsExpanded =

                    transitionAnimation.immediatelyTransitionTo(

                        blurConfig.maxBlurRadiusPx.maxBlurRadiusToNotificationPanelBlurRadius()

                    ),

                    transitionAnimation.immediatelyTransitionTo(blurConfig.maxBlurRadiusPx),

            )

        } else {

            emptyFlow()