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

Commit fc98c6fa authored by Josh Tsuji's avatar Josh Tsuji
Browse files

Clean up hiding while occluded. 

We were passing empty params to handleStartKeyguardExitAnimation, without actually starting the animation. This ultimately short circuits, with the only real effects being calls to keyguardViewController#hide and onKeyguardExitFinished(). It's much more clear if handleStartKeyguardExitAnimation is only called
to... handle starting the keyguard exit animation.

There's one remaining use of empty handleStartKeyguardExitAnimation
in handleSetOccluded; I'll fix that in a followup just in case this
CL causes issues.

Bug: 272316191
Test: unlock from camera with remote animations enabled/disabled
Change-Id: Ida4f342fc06b3dcfa1c0e4e8ef45acddd37a586b
parent d30e55c5

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+7 −9
Original line number Diff line number Diff line
@@ -2564,18 +2564,16 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
        synchronized (KeyguardViewMediator.this) {

            if (DEBUG) Log.d(TAG, "handleHide");



            mHiding = true;



            if (mShowing && !mOccluded) {

                mHiding = true;

                mKeyguardGoingAwayRunnable.run();

            } else {

                // TODO(bc-unlock): Fill parameters

                mNotificationShadeWindowControllerLazy.get().batchApplyWindowLayoutParams(() -> {

                    handleStartKeyguardExitAnimation(

                Log.d(TAG, "Hiding keyguard while occluded. Just hide the keyguard view and exit.");



                mKeyguardViewControllerLazy.get().hide(

                        SystemClock.uptimeMillis() + mHideAnimation.getStartOffset(),

                            mHideAnimation.getDuration(), null /* apps */, null /* wallpapers */,

                            null /* nonApps */, null /* finishedCallback */);

                });

                        mHideAnimation.getDuration());

                onKeyguardExitFinished();

            }



            // It's possible that the device was unlocked (via BOUNCER or Fingerprint) while