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

Commit 6bcaace5 authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "Bring back Keyguard CANNED_UNLOCK_START_DELAY wait" into udc-dev am:... 

Merge "Bring back Keyguard CANNED_UNLOCK_START_DELAY wait" into udc-dev am: c42b01e3 am: cbc30ad2

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



Change-Id: Id1490ea548dbac9aebdea548ce840d1e15fe9af4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 270f6a56 cbc30ad2

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

+18 −2
Original line number Diff line number Diff line
@@ -668,8 +668,24 @@ class KeyguardUnlockAnimationController @Inject constructor( 
            lockscreenSmartspace?.visibility = View.INVISIBLE

        }



        // Start an animation for the wallpaper, which will finish keyguard exit when it completes.

        // As soon as the shade has animated out of the way, start the canned unlock animation,

        // which will finish keyguard exit when it completes. The in-window animations in the

        // Launcher window will end on their own.

        handler.postDelayed({

            if (keyguardViewMediator.get().isShowingAndNotOccluded &&

                !keyguardStateController.isKeyguardGoingAway) {

                    Log.e(TAG, "Finish keyguard exit animation delayed Runnable ran, but we are " +

                            "showing and not going away.")

                return@postDelayed

            }



            if (wallpaperTargets != null) {

              fadeInWallpaper()

            } else {

                keyguardViewMediator.get().exitKeyguardAndFinishSurfaceBehindRemoteAnimation(

                    false /* cancelled */)

            }

        }, CANNED_UNLOCK_START_DELAY)

    }



    /**