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

Commit 228df4ee authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Account for last animated-to-sleep state when calculating nav... 

Merge "Account for last animated-to-sleep state when calculating nav visibility" into sc-qpr1-dev am: ac32f8b8 am: 813f93e4

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

Change-Id: Ieebba325ed554403d84f808cce8ec153aab8e9bb
parents 56bd0e75 813f93e4

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -197,6 +197,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
    private boolean mLastGesturalNav;

    private boolean mLastGesturalNav;

    private boolean mLastIsDocked;

    private boolean mLastIsDocked;

    private boolean mLastPulsing;

    private boolean mLastPulsing;

    private boolean mLastAnimatedToSleep;

    private int mLastBiometricMode;

    private int mLastBiometricMode;

    private boolean mQsExpanded;

    private boolean mQsExpanded;

    private boolean mAnimatedToSleep;

    private boolean mAnimatedToSleep;
@@ -1012,6 +1013,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        mLastBiometricMode = mBiometricUnlockController.getMode();

        mLastBiometricMode = mBiometricUnlockController.getMode();

        mLastGesturalNav = mGesturalNav;

        mLastGesturalNav = mGesturalNav;

        mLastIsDocked = mIsDocked;

        mLastIsDocked = mIsDocked;

        mLastAnimatedToSleep = mAnimatedToSleep;

        mStatusBar.onKeyguardViewManagerStatesUpdated();

        mStatusBar.onKeyguardViewManagerStatesUpdated();

    }

    }
@@ -1055,7 +1057,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        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;

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

        return (!keyguardShowing && !hideWhileDozing || mLastBouncerShowing

        return (!mLastAnimatedToSleep && !keyguardShowing && !hideWhileDozing || mLastBouncerShowing

                || mLastRemoteInputActive || keyguardWithGestureNav

                || mLastRemoteInputActive || keyguardWithGestureNav

                || mLastGlobalActionsVisible);

                || mLastGlobalActionsVisible);

    }

    }