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

Merge "Only hide udfps bouncer when transitioning TO doze" into sc-dev

Browse Source
This commit is contained in:
Beverly Tai
2021-07-08 22:36:37 +00:00
committed by Android (Google) Code Review
parent f701c8d1d8 1093f7c370
commit 6fbb5bec73
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java
View File

@@ -66,6 +66,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
private boolean mHintShown; private boolean mHintShown;
private int mStatusBarState; private int mStatusBarState;
private float mTransitionToFullShadeProgress; private float mTransitionToFullShadeProgress;
private float mLastDozeAmount;
/** /**
* hidden amount of pin/pattern/password bouncer * hidden amount of pin/pattern/password bouncer
@@ -108,6 +109,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
updateFaceDetectRunning(mKeyguardUpdateMonitor.isFaceDetectionRunning()); updateFaceDetectRunning(mKeyguardUpdateMonitor.isFaceDetectionRunning());
final float dozeAmount = mStatusBarStateController.getDozeAmount(); final float dozeAmount = mStatusBarStateController.getDozeAmount();
mLastDozeAmount = dozeAmount;
mStateListener.onDozeAmountChanged(dozeAmount, dozeAmount); mStateListener.onDozeAmountChanged(dozeAmount, dozeAmount);
mStatusBarStateController.addCallback(mStateListener); mStatusBarStateController.addCallback(mStateListener);
@@ -287,8 +289,11 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
new StatusBarStateController.StateListener() { new StatusBarStateController.StateListener() {
@Override @Override
public void onDozeAmountChanged(float linear, float eased) { public void onDozeAmountChanged(float linear, float eased) {
if (linear != 0) showUdfpsBouncer(false); if (mLastDozeAmount < linear) {
showUdfpsBouncer(false);
}
mView.onDozeAmountChanged(linear, eased); mView.onDozeAmountChanged(linear, eased);
mLastDozeAmount = linear;
updatePauseAuth(); updatePauseAuth();
} }