Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ifa7eafdf05825346519a4ba2910c1bfb22e9fa6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-05 17:30:15 +00:00
committed by Automerger Merge Worker
parent b92fc270de 6cd395206c
commit cd6c9014ef
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt
View File

@@ -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.ILauncherUnlockAnimationController
import com.android.systemui.shared.system.smartspace.ISysuiUnlockAnimationController import com.android.systemui.shared.system.smartspace.ISysuiUnlockAnimationController
import com.android.systemui.shared.system.smartspace.SmartspaceState 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.phone.BiometricUnlockController
import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.statusbar.policy.KeyguardStateController
import dagger.Lazy import dagger.Lazy
@@ -140,7 +141,8 @@ class KeyguardUnlockAnimationController @Inject constructor(
keyguardViewMediator: Lazy<KeyguardViewMediator>, keyguardViewMediator: Lazy<KeyguardViewMediator>,
private val keyguardViewController: KeyguardViewController, private val keyguardViewController: KeyguardViewController,
private val featureFlags: FeatureFlags, private val featureFlags: FeatureFlags,
private val biometricUnlockControllerLazy: Lazy<BiometricUnlockController> private val biometricUnlockControllerLazy: Lazy<BiometricUnlockController>,
private val statusBarStateController: SysuiStatusBarStateController
) : KeyguardStateController.Callback, ISysuiUnlockAnimationController.Stub() { ) : KeyguardStateController.Callback, ISysuiUnlockAnimationController.Stub() {
interface KeyguardUnlockAnimationListener { interface KeyguardUnlockAnimationListener {
@@ -372,7 +374,8 @@ class KeyguardUnlockAnimationController @Inject constructor(
* changed. * changed.
*/ */
override fun onKeyguardGoingAwayChanged() { override fun onKeyguardGoingAwayChanged() {
if (keyguardStateController.isKeyguardGoingAway) { if (keyguardStateController.isKeyguardGoingAway
&& !statusBarStateController.leaveOpenOnKeyguardHide()) {
prepareForInWindowLauncherAnimations() prepareForInWindowLauncherAnimations()
} }
} }

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

@@ -14,6 +14,7 @@ import androidx.test.filters.SmallTest
import com.android.keyguard.KeyguardViewController import com.android.keyguard.KeyguardViewController
import com.android.systemui.SysuiTestCase import com.android.systemui.SysuiTestCase
import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.FeatureFlags
import com.android.systemui.statusbar.SysuiStatusBarStateController
import com.android.systemui.statusbar.phone.BiometricUnlockController import com.android.systemui.statusbar.phone.BiometricUnlockController
import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.statusbar.policy.KeyguardStateController
import junit.framework.Assert.assertEquals import junit.framework.Assert.assertEquals
@@ -49,6 +50,8 @@ class KeyguardUnlockAnimationControllerTest : SysuiTestCase() {
private lateinit var biometricUnlockController: BiometricUnlockController private lateinit var biometricUnlockController: BiometricUnlockController
@Mock @Mock
private lateinit var surfaceTransactionApplier: SyncRtSurfaceTransactionApplier private lateinit var surfaceTransactionApplier: SyncRtSurfaceTransactionApplier
@Mock
private lateinit var statusBarStateController: SysuiStatusBarStateController
private lateinit var remoteAnimationTarget: RemoteAnimationTarget private lateinit var remoteAnimationTarget: RemoteAnimationTarget
@@ -57,7 +60,7 @@ class KeyguardUnlockAnimationControllerTest : SysuiTestCase() {
MockitoAnnotations.initMocks(this) MockitoAnnotations.initMocks(this)
keyguardUnlockAnimationController = KeyguardUnlockAnimationController( keyguardUnlockAnimationController = KeyguardUnlockAnimationController(
context, keyguardStateController, { keyguardViewMediator }, keyguardViewController, context, keyguardStateController, { keyguardViewMediator }, keyguardViewController,
featureFlags, { biometricUnlockController } featureFlags, { biometricUnlockController }, statusBarStateController
) )
`when`(keyguardViewController.viewRootImpl).thenReturn(mock(ViewRootImpl::class.java)) `when`(keyguardViewController.viewRootImpl).thenReturn(mock(ViewRootImpl::class.java))