Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I3c1c2e9d52dff6494be6040ff68f57d8f483d31b
This commit is contained in:
Winson Chung
2021-09-16 03:19:27 +00:00
committed by Automerger Merge Worker
parent 6727ad6ced ac32f8b813
commit e0cb0b895f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
} }