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

Commit f611c595 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Fix lockscreen anim not running on unlock with FPS" into udc-dev am: 811aeb73 

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



Change-Id: I1faf51b72ce360a0258ec9cc9a95a11c6061ccac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e5afaa78 811aeb73

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

+6 −2
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import com.android.systemui.shared.system.smartspace.SmartspaceState 
import com.android.systemui.statusbar.NotificationShadeWindowController

import com.android.systemui.statusbar.SysuiStatusBarStateController

import com.android.systemui.statusbar.phone.BiometricUnlockController

import com.android.systemui.statusbar.phone.BiometricUnlockController.MODE_WAKE_AND_UNLOCK_FROM_DREAM

import com.android.systemui.statusbar.policy.KeyguardStateController

import dagger.Lazy

import javax.inject.Inject
@@ -173,7 +174,7 @@ class KeyguardUnlockAnimationController @Inject constructor( 
        @JvmDefault

        fun onUnlockAnimationStarted(

            playingCannedAnimation: Boolean,

            fromWakeAndUnlock: Boolean,

            isWakeAndUnlockNotFromDream: Boolean,

            unlockAnimationStartDelay: Long,

            unlockAnimationDuration: Long

        ) {}
@@ -590,10 +591,13 @@ class KeyguardUnlockAnimationController @Inject constructor( 
            playCannedUnlockAnimation()

        }



        // Notify if waking from AOD only

        val isWakeAndUnlockNotFromDream = biometricUnlockControllerLazy.get().isWakeAndUnlock &&

            biometricUnlockControllerLazy.get().mode != MODE_WAKE_AND_UNLOCK_FROM_DREAM

        listeners.forEach {

            it.onUnlockAnimationStarted(

                playingCannedUnlockAnimation /* playingCannedAnimation */,

                biometricUnlockControllerLazy.get().isWakeAndUnlock /* isWakeAndUnlock */,

                isWakeAndUnlockNotFromDream /* isWakeAndUnlockNotFromDream */,

                CANNED_UNLOCK_START_DELAY /* unlockStartDelay */,

                LAUNCHER_ICONS_ANIMATION_DURATION_MS /* unlockAnimationDuration */) }

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+5 −4
Original line number Diff line number Diff line
@@ -935,10 +935,11 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
                    @Override

                    public void onUnlockAnimationStarted(

                            boolean playingCannedAnimation,

                            boolean isWakeAndUnlock,

                            boolean isWakeAndUnlockNotFromDream,

                            long startDelay,

                            long unlockAnimationDuration) {

                        unlockAnimationStarted(playingCannedAnimation, isWakeAndUnlock, startDelay);

                        unlockAnimationStarted(playingCannedAnimation, isWakeAndUnlockNotFromDream,

                                startDelay);

                    }

                });

        mAlternateBouncerInteractor = alternateBouncerInteractor;
@@ -953,7 +954,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 


    private void unlockAnimationStarted(

            boolean playingCannedAnimation,

            boolean isWakeAndUnlock,

            boolean isWakeAndUnlockNotFromDream,

            long unlockAnimationStartDelay) {

        // Disable blurs while we're unlocking so that panel expansion does not

        // cause blurring. This will eventually be re-enabled by the panel view on
@@ -961,7 +962,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        // unlock gesture, and we don't want that to cause blurring either.

        mDepthController.setBlursDisabledForUnlock(mTracking);



        if (playingCannedAnimation && !isWakeAndUnlock) {

        if (playingCannedAnimation && !isWakeAndUnlockNotFromDream) {

            // Hide the panel so it's not in the way or the surface behind the

            // keyguard, which will be appearing. If we're wake and unlocking, the

            // lock screen is hidden instantly so should not be flung away.

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

+42 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import com.android.systemui.statusbar.NotificationShadeWindowController 
import com.android.systemui.statusbar.SysuiStatusBarStateController

import com.android.systemui.statusbar.phone.BiometricUnlockController

import com.android.systemui.statusbar.policy.KeyguardStateController

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.argThat

import com.android.systemui.util.mockito.whenever

import junit.framework.Assert.assertEquals
@@ -33,6 +34,7 @@ import org.junit.Test 
import org.junit.runner.RunWith

import org.mockito.Mock

import org.mockito.Mockito.atLeastOnce

import org.mockito.Mockito.eq

import org.mockito.Mockito.mock

import org.mockito.Mockito.never

import org.mockito.Mockito.times
@@ -177,6 +179,46 @@ class KeyguardUnlockAnimationControllerTest : SysuiTestCase() { 
            false /* cancelled */)

    }



    @Test

    fun onWakeAndUnlock_notifiesListenerWithTrue() {

        whenever(biometricUnlockController.isWakeAndUnlock).thenReturn(true)

        whenever(biometricUnlockController.mode).thenReturn(

            BiometricUnlockController.MODE_WAKE_AND_UNLOCK)



        val listener = mock(

            KeyguardUnlockAnimationController.KeyguardUnlockAnimationListener::class.java)

        keyguardUnlockAnimationController.addKeyguardUnlockAnimationListener(listener)



        keyguardUnlockAnimationController.notifyStartSurfaceBehindRemoteAnimation(

            remoteAnimationTargets,

            wallpaperTargets,

            0 /* startTime */,

            false /* requestedShowSurfaceBehindKeyguard */

        )



        verify(listener).onUnlockAnimationStarted(any(), eq(true), any(), any())

    }



    @Test

    fun onWakeAndUnlockFromDream_notifiesListenerWithFalse() {

        whenever(biometricUnlockController.isWakeAndUnlock).thenReturn(true)

        whenever(biometricUnlockController.mode).thenReturn(

            BiometricUnlockController.MODE_WAKE_AND_UNLOCK_FROM_DREAM)



        val listener = mock(

            KeyguardUnlockAnimationController.KeyguardUnlockAnimationListener::class.java)

        keyguardUnlockAnimationController.addKeyguardUnlockAnimationListener(listener)



        keyguardUnlockAnimationController.notifyStartSurfaceBehindRemoteAnimation(

            remoteAnimationTargets,

            wallpaperTargets,

            0 /* startTime */,

            false /* requestedShowSurfaceBehindKeyguard */

        )



        verify(listener).onUnlockAnimationStarted(any(), eq(false), any(), any())

    }



    /**

     * If we requested that the surface behind be made visible, and we're not flinging away the

     * keyguard, it means that we're swiping to unlock and want the surface visible so it can follow