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

Commit b4b46a84 authored by Beverly's avatar Beverly
Browse files

Re-prioritize keyguard visibility animation logic 

If the unlock animation should run, we should run it to make
sure that the device's state actually updates to KEYGUARD
when running the unlock animation.

Test: manual
Bug: 205587594
Change-Id: I50a948f3bb199f52d81dbd6066a603bea67a16bc
parent d5b3c800

packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java

+7 −7
Original line number Diff line number Diff line
@@ -121,6 +121,13 @@ public class KeyguardVisibilityHelper { 
                            .setStartDelay(delay);

                }

                animator.start();

            } else if (mUnlockedScreenOffAnimationController.shouldAnimateInKeyguard()) {

                mKeyguardViewVisibilityAnimating = true;



                // Ask the screen off animation controller to animate the keyguard visibility for us

                // since it may need to be cancelled due to keyguard lifecycle events.

                mUnlockedScreenOffAnimationController.animateInKeyguard(

                        mView, mAnimateKeyguardStatusViewVisibleEndRunnable);

            } else if (mLastOccludedState && !isOccluded) {

                // An activity was displayed over the lock screen, and has now gone away

                mView.setVisibility(View.VISIBLE);
@@ -132,13 +139,6 @@ public class KeyguardVisibilityHelper { 
                        .alpha(1f)

                        .withEndAction(mAnimateKeyguardStatusViewVisibleEndRunnable)

                        .start();

            } else if (mUnlockedScreenOffAnimationController.shouldAnimateInKeyguard()) {

                mKeyguardViewVisibilityAnimating = true;



                // Ask the screen off animation controller to animate the keyguard visibility for us

                // since it may need to be cancelled due to keyguard lifecycle events.

                mUnlockedScreenOffAnimationController.animateInKeyguard(

                        mView, mAnimateKeyguardStatusViewVisibleEndRunnable);

            } else {

                mView.setVisibility(View.VISIBLE);

                mView.setAlpha(1f);