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

Commit 5c05429e authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Consider shade expansion when blurring because QS" into sc-dev am: 65c43136 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15503404

Change-Id: I4a52b3d28b84e1719ee2e0b14be4794db5bd18fd
parents 81dd9d0c 65c43136

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt

+2 −1
Original line number Original line Diff line number Diff line
@@ -178,7 +178,8 @@ class NotificationShadeDepthController @Inject constructor( 
                blurUtils.minBlurRadius, blurUtils.maxBlurRadius)

                blurUtils.minBlurRadius, blurUtils.maxBlurRadius)

        var combinedBlur = (shadeSpring.radius * INTERACTION_BLUR_FRACTION +

        var combinedBlur = (shadeSpring.radius * INTERACTION_BLUR_FRACTION +

                normalizedBlurRadius * ANIMATION_BLUR_FRACTION).toInt()

                normalizedBlurRadius * ANIMATION_BLUR_FRACTION).toInt()

        combinedBlur = max(combinedBlur, blurUtils.blurRadiusOfRatio(qsPanelExpansion))

        val qsExpandedRatio = qsPanelExpansion * shadeExpansion

        combinedBlur = max(combinedBlur, blurUtils.blurRadiusOfRatio(qsExpandedRatio))

        combinedBlur = max(combinedBlur, blurUtils.blurRadiusOfRatio(transitionToFullShadeProgress))

        combinedBlur = max(combinedBlur, blurUtils.blurRadiusOfRatio(transitionToFullShadeProgress))

        var shadeRadius = max(combinedBlur, wakeAndUnlockBlurRadius).toFloat()

        var shadeRadius = max(combinedBlur, wakeAndUnlockBlurRadius).toFloat()

packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationShadeDepthControllerTest.kt

+2 −1
Original line number Original line Diff line number Diff line
@@ -184,8 +184,9 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { 
    @Test

    @Test

    fun setQsPanelExpansion_appliesBlur() {

    fun setQsPanelExpansion_appliesBlur() {

        notificationShadeDepthController.qsPanelExpansion = 1f

        notificationShadeDepthController.qsPanelExpansion = 1f

        notificationShadeDepthController.onPanelExpansionChanged(0.5f, tracking = false)

        notificationShadeDepthController.updateBlurCallback.doFrame(0)

        notificationShadeDepthController.updateBlurCallback.doFrame(0)

        verify(blurUtils).applyBlur(any(), eq(maxBlur), eq(false))

        verify(blurUtils).applyBlur(any(), eq(maxBlur / 2), eq(false))

    }

    }





    @Test

    @Test