diff options
| author | 2023-03-08 23:07:21 +0000 | |
|---|---|---|
| committer | 2023-03-08 23:07:21 +0000 | |
| commit | bc13c4e4a09e4529f66442db5bbd088d1a781c16 (patch) | |
| tree | 9dd070f6e804a6b2179d28c284e07908d43ceb70 | |
| parent | 345ae533fd475518b498aa0f9582f165f7682322 (diff) | |
| parent | 0011ba7e1c5edaf4291fd1c2d7980512296f2c5a (diff) | |
Merge "Add unlock animation for foldables" into tm-qpr-dev am: 0011ba7e1c
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>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt index f964cb39a8d4..913748d67daf 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt @@ -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 } /** |