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

Commit 3fd2ce48 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Remove flicker when unlocking + turning off screen" into... 

Merge "Merge "Remove flicker when unlocking + turning off screen" into udc-qpr-dev am: 75748b6b" into udc-qpr-dev-plus-aosp
parents 9731a50d d039d514

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt

+1 −4
Original line number Diff line number Diff line
@@ -906,10 +906,7 @@ class KeyguardUnlockAnimationController @Inject constructor( 
    }



    fun setWallpaperAppearAmount(amount: Float) {

        val animationAlpha = when {

            !powerManager.isInteractive -> 0f

            else -> amount

        }

        val animationAlpha = amount



        wallpaperTargets?.forEach { wallpaper ->

            // SyncRtSurfaceTransactionApplier cannot apply transaction when the target view is

packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardUnlockAnimationControllerTest.kt

+0 −2
Original line number Diff line number Diff line
@@ -385,8 +385,6 @@ class KeyguardUnlockAnimationControllerTest : SysuiTestCase() { 
        // We expect that we've set the surface behind to alpha = 0f since we're not interactive.

        assertEquals(0f, params.alpha)

        assertTrue(params.matrix.isIdentity)

        assertEquals("Wallpaper surface was expected to have opacity 0",

                0f, captorWp.getLastValue().alpha)



        verifyNoMoreInteractions(surfaceTransactionApplier)

    }