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

Commit 828730e3 authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "Cancel the wallpaper animation after the tests" into udc-dev am: 3b928069 am: 110db142 

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



Change-Id: I92a49bbd0de655deb298a7e4c0f544e2596bf247
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 15afeee2 110db142

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

+2 −2
Original line number Diff line number Diff line
@@ -113,8 +113,8 @@ class KeyguardUnlockAnimationControllerTest : SysuiTestCase() { 


    @After

    fun tearDown() {

        keyguardUnlockAnimationController.surfaceBehindEntryAnimator.cancel()

        keyguardUnlockAnimationController.surfaceBehindAlphaAnimator.cancel()

        keyguardUnlockAnimationController.notifyFinishedKeyguardExitAnimation(true)

        keyguardUnlockAnimationController.wallpaperAlphaAnimator.cancel()

    }



    /**