Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit caa6eee0 authored by Andreas Miko's avatar Andreas Miko Committed by Automerger Merge Worker
Browse files

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

Merge "Add unlock animation for foldables" into tm-qpr-dev am: 0011ba7e am: bc13c4e4 am: 77817d11

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



Change-Id: I0314ad05cde7ce9987272478d9905193418e2ce3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6057ef99 77817d11

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt

+1 −4
Original line number Diff line number Diff line
@@ -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

    }



    /**