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

Commit 8005700e authored by Nick Chameyev's avatar Nick Chameyev Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cherrypick-fold-aod-keyguard-visible-zt6i81p6jh" into tm-mainline-prod 

* changes:
  [automerge] [Fold to AOD] Respect screen off animation status in navbar when keyguard is showing 2p: 63fa0d51
  [Fold to AOD] Respect screen off animation status in navbar when keyguard is showing
parents d3fdc6d4 a1b113b8

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+4 −2
Original line number Diff line number Diff line
@@ -1077,7 +1077,8 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
                && mBiometricUnlockController.getMode() == MODE_WAKE_AND_UNLOCK_PULSING;

        boolean keyguardShowing = mShowing && !mOccluded;

        boolean hideWhileDozing = mDozing && !isWakeAndUnlockPulsing;

        boolean keyguardWithGestureNav = (keyguardShowing && !mDozing || mPulsing && !mIsDocked)

        boolean keyguardWithGestureNav = (keyguardShowing && !mDozing && !mScreenOffAnimationPlaying

                || mPulsing && !mIsDocked)

                && mGesturalNav;

        return (!keyguardShowing && !hideWhileDozing && !mScreenOffAnimationPlaying

                || mBouncer.isShowing() || mRemoteInputActive || keyguardWithGestureNav
@@ -1091,7 +1092,8 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        boolean keyguardShowing = mLastShowing && !mLastOccluded;

        boolean hideWhileDozing = mLastDozing && mLastBiometricMode != MODE_WAKE_AND_UNLOCK_PULSING;

        boolean keyguardWithGestureNav = (keyguardShowing && !mLastDozing

                || mLastPulsing && !mLastIsDocked) && mLastGesturalNav;

                && !mLastScreenOffAnimationPlaying || mLastPulsing && !mLastIsDocked)

                && mLastGesturalNav;

        return (!keyguardShowing && !hideWhileDozing && !mLastScreenOffAnimationPlaying

                || mLastBouncerShowing || mLastRemoteInputActive || keyguardWithGestureNav

                || mLastGlobalActionsVisible);