Merge "Add unlock animation for foldables" into tm-qpr-dev am: 0011ba7e1c am: bc13c4e4a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21480177 Change-Id: I87dec73168eff29ca1de6723b4271fde4d87b84d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -380,10 +380,7 @@ class KeyguardUnlockAnimationController @Inject constructor(
|
||||
// If the launcher is underneath, but we're about to launch an activity, don't do
|
||||
// the animations since they won't be visible.
|
||||
!notificationShadeWindowController.isLaunchingActivity &&
|
||||
launcherUnlockController != null &&
|
||||
// Temporarily disable for foldables since foldable launcher has two first pages,
|
||||
// which breaks the in-window animation.
|
||||
!isFoldable(context)
|
||||
launcherUnlockController != null
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user