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

Merge "Add unlock animation for foldables" into tm-qpr-dev am: 0011ba7e1c

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

Change-Id: I8ca3ef1eb031336c725c7fdc5ab0a343e92ff09e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Andreas Miko
2023-03-08 23:07:21 +00:00
committed by Automerger Merge Worker
parent 345ae533fd 0011ba7e1c
commit bc13c4e4a0
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt
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)
} }
/** /**