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

Commit 7856531b authored by Josh Tsuji's avatar Josh Tsuji Committed by Android (Google) Code Review
Browse files

Merge "Clean up hiding while occluded."

parents bb021842 fc98c6fa
Loading
Loading
Loading
Loading
+7 −9
Original line number Original line Diff line number Diff line
@@ -2564,18 +2564,16 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
        synchronized (KeyguardViewMediator.this) {
        synchronized (KeyguardViewMediator.this) {
            if (DEBUG) Log.d(TAG, "handleHide");
            if (DEBUG) Log.d(TAG, "handleHide");


            mHiding = true;

            if (mShowing && !mOccluded) {
            if (mShowing && !mOccluded) {
                mHiding = true;
                mKeyguardGoingAwayRunnable.run();
                mKeyguardGoingAwayRunnable.run();
            } else {
            } else {
                // TODO(bc-unlock): Fill parameters
                Log.d(TAG, "Hiding keyguard while occluded. Just hide the keyguard view and exit.");
                mNotificationShadeWindowControllerLazy.get().batchApplyWindowLayoutParams(() -> {

                    handleStartKeyguardExitAnimation(
                mKeyguardViewControllerLazy.get().hide(
                        SystemClock.uptimeMillis() + mHideAnimation.getStartOffset(),
                        SystemClock.uptimeMillis() + mHideAnimation.getStartOffset(),
                            mHideAnimation.getDuration(), null /* apps */, null /* wallpapers */,
                        mHideAnimation.getDuration());
                            null /* nonApps */, null /* finishedCallback */);
                onKeyguardExitFinished();
                });
            }
            }


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