Merge "Only hide udfps bouncer when transitioning TO doze" into sc-dev am: 6fbb5bec73 am: bf150588ad

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

Change-Id: Ifa3692bc7021f97f1313481f9acb824c25eb180b
This commit is contained in:
Beverly Tai
2021-07-08 23:09:53 +00:00
committed by Automerger Merge Worker

View File

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