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

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

Merge "Don't prepare in-window animations if leaveKeyguardOpenOnHide." into tm-dev am: 6cd39520 

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



Change-Id: Ifa7eafdf05825346519a4ba2910c1bfb22e9fa6b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b92fc270 6cd39520

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

+5 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import com.android.systemui.shared.system.QuickStepContract 
import com.android.systemui.shared.system.smartspace.ILauncherUnlockAnimationController

import com.android.systemui.shared.system.smartspace.ISysuiUnlockAnimationController

import com.android.systemui.shared.system.smartspace.SmartspaceState

import com.android.systemui.statusbar.SysuiStatusBarStateController

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

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

import dagger.Lazy
@@ -140,7 +141,8 @@ class KeyguardUnlockAnimationController @Inject constructor( 
    keyguardViewMediator: Lazy<KeyguardViewMediator>,

    private val keyguardViewController: KeyguardViewController,

    private val featureFlags: FeatureFlags,

    private val biometricUnlockControllerLazy: Lazy<BiometricUnlockController>

    private val biometricUnlockControllerLazy: Lazy<BiometricUnlockController>,

    private val statusBarStateController: SysuiStatusBarStateController

) : KeyguardStateController.Callback, ISysuiUnlockAnimationController.Stub() {



    interface KeyguardUnlockAnimationListener {
@@ -372,7 +374,8 @@ class KeyguardUnlockAnimationController @Inject constructor( 
     * changed.

     */

    override fun onKeyguardGoingAwayChanged() {

        if (keyguardStateController.isKeyguardGoingAway) {

        if (keyguardStateController.isKeyguardGoingAway

            && !statusBarStateController.leaveOpenOnKeyguardHide()) {

            prepareForInWindowLauncherAnimations()

        }

    }

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

+4 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ import androidx.test.filters.SmallTest 
import com.android.keyguard.KeyguardViewController

import com.android.systemui.SysuiTestCase

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.statusbar.SysuiStatusBarStateController

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

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

import junit.framework.Assert.assertEquals
@@ -49,6 +50,8 @@ class KeyguardUnlockAnimationControllerTest : SysuiTestCase() { 
    private lateinit var biometricUnlockController: BiometricUnlockController

    @Mock

    private lateinit var surfaceTransactionApplier: SyncRtSurfaceTransactionApplier

    @Mock

    private lateinit var statusBarStateController: SysuiStatusBarStateController



    private lateinit var remoteAnimationTarget: RemoteAnimationTarget
@@ -57,7 +60,7 @@ class KeyguardUnlockAnimationControllerTest : SysuiTestCase() { 
        MockitoAnnotations.initMocks(this)

        keyguardUnlockAnimationController = KeyguardUnlockAnimationController(

            context, keyguardStateController, { keyguardViewMediator }, keyguardViewController,

            featureFlags, { biometricUnlockController }

            featureFlags, { biometricUnlockController }, statusBarStateController

        )



        `when`(keyguardViewController.viewRootImpl).thenReturn(mock(ViewRootImpl::class.java))