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

Commit 31e4ac17 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [15903372, 15903387, 15903254, 15903325, 15903326,... 

Merge cherrypicks of [15903372, 15903387, 15903254, 15903325, 15903326, 15903407, 15903408, 15903005] into sc-d1-release

Change-Id: Idf98ea85178d9ca5027c233df41359e4245cbf8b
parents 453cf8d4 ca677ffd

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

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

    private boolean mLastIsDocked;

    private boolean mLastPulsing;

    private boolean mLastAnimatedToSleep;

    private int mLastBiometricMode;

    private boolean mQsExpanded;

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

        mLastGesturalNav = mGesturalNav;

        mLastIsDocked = mIsDocked;

        mLastAnimatedToSleep = mAnimatedToSleep;

        mStatusBar.onKeyguardViewManagerStatesUpdated();

    }
@@ -1033,7 +1035,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        boolean hideWhileDozing = mLastDozing && mLastBiometricMode != MODE_WAKE_AND_UNLOCK_PULSING;

        boolean keyguardWithGestureNav = (keyguardShowing && !mLastDozing

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

        return (!keyguardShowing && !hideWhileDozing || mLastBouncerShowing

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

                || mLastRemoteInputActive || keyguardWithGestureNav

                || mLastGlobalActionsVisible);

    }