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

Commit d039d514 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove flicker when unlocking + turning off screen" into udc-qpr-dev am: 75748b6b 

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



Change-Id: I3611e025a4baed5ff467ae14e156b8fad86c674c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c51ba1aa 75748b6b

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)

    }