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

Commit 6d387952 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Fix wallpaper zoom regression 

Zooms should happen as well when blurs are disabled

Fixes: 192087101
Test: atest NotificationShadeDepthControllerTest
Change-Id: I1c869bfda19e157259f0b4f9c9cee01aab40e6e5
parent 598f0602

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

+5 −1
Original line number Diff line number Diff line
@@ -195,11 +195,15 @@ class NotificationShadeDepthController @Inject constructor( 
        var blur = max(shadeRadius.toInt(), globalActionsRadius)



        // Make blur be 0 if it is necessary to stop blur effect.

        if (scrimsVisible || !blurUtils.supportsBlursOnWindows()) {

        if (scrimsVisible) {

            blur = 0

        }

        val zoomOut = blurUtils.ratioOfBlurRadius(blur)



        if (!blurUtils.supportsBlursOnWindows()) {

            blur = 0

        }



        // Brightness slider removes blur, but doesn't affect zooms

        blur = (blur * (1f - brightnessMirrorSpring.ratio)).toInt()

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

+10 −0
Original line number Diff line number Diff line
@@ -200,9 +200,19 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { 
    @Test

    fun setFullShadeTransition_appliesBlur_onlyIfSupported() {

        reset(blurUtils)

        `when`(blurUtils.blurRadiusOfRatio(anyFloat())).then { answer ->

            (answer.arguments[0] as Float * maxBlur).toInt()

        }

        `when`(blurUtils.ratioOfBlurRadius(anyInt())).then { answer ->

            answer.arguments[0] as Int / maxBlur.toFloat()

        }

        `when`(blurUtils.maxBlurRadius).thenReturn(maxBlur)

        `when`(blurUtils.maxBlurRadius).thenReturn(maxBlur)



        notificationShadeDepthController.transitionToFullShadeProgress = 1f

        notificationShadeDepthController.updateBlurCallback.doFrame(0)

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

        verify(wallpaperManager).setWallpaperZoomOut(any(), eq(1f))

    }



    @Test