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

Commit d05f813c authored by Nick Chameyev's avatar Nick Chameyev Committed by Presubmit Automerger Backend
Browse files

[automerge] [Fold to AOD] Respect screen off animation status in navbar when... 

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

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

Bug: 202844967
Change-Id: I88cf625cb925bac361d8a1032eb1cd4d8d4df337
parents 6100cabe 63fa0d51

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

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

                && mBiometricUnlockController.getMode() == MODE_WAKE_AND_UNLOCK_PULSING;

        boolean keyguardShowing = mShowing && !mOccluded;

        boolean keyguardShowing = mShowing && !mOccluded;

        boolean hideWhileDozing = mDozing && !isWakeAndUnlockPulsing;

        boolean hideWhileDozing = mDozing && !isWakeAndUnlockPulsing;

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

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

                || mPulsing && !mIsDocked)

                && mGesturalNav;

                && mGesturalNav;

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

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

                || mBouncer.isShowing() || mRemoteInputActive || keyguardWithGestureNav

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

        boolean keyguardShowing = mLastShowing && !mLastOccluded;

        boolean hideWhileDozing = mLastDozing && mLastBiometricMode != MODE_WAKE_AND_UNLOCK_PULSING;

        boolean hideWhileDozing = mLastDozing && mLastBiometricMode != MODE_WAKE_AND_UNLOCK_PULSING;

        boolean keyguardWithGestureNav = (keyguardShowing && !mLastDozing

        boolean keyguardWithGestureNav = (keyguardShowing && !mLastDozing

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

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

                && mLastGesturalNav;

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

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

                || mLastBouncerShowing || mLastRemoteInputActive || keyguardWithGestureNav

                || mLastBouncerShowing || mLastRemoteInputActive || keyguardWithGestureNav

                || mLastGlobalActionsVisible);

                || mLastGlobalActionsVisible);