Merge "Add unlock animation for foldables" into tm-qpr-dev

This commit is contained in:
Andreas Miko
2023-03-08 22:40:21 +00:00
committed by Android (Google) Code Review

View File

@@ -380,10 +380,7 @@ class KeyguardUnlockAnimationController @Inject constructor(
// If the launcher is underneath, but we're about to launch an activity, don't do // If the launcher is underneath, but we're about to launch an activity, don't do
// the animations since they won't be visible. // the animations since they won't be visible.
!notificationShadeWindowController.isLaunchingActivity && !notificationShadeWindowController.isLaunchingActivity &&
launcherUnlockController != null && launcherUnlockController != null
// Temporarily disable for foldables since foldable launcher has two first pages,
// which breaks the in-window animation.
!isFoldable(context)
} }
/** /**