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

Commit 63f1482b authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

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

Merge "Only hide udfps bouncer when transitioning TO doze" into sc-dev am: 6fbb5bec am: 1f648978

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

Change-Id: I4add34990020e722234e5309edaab885dee4f543
parents 38f127e0 1f648978

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -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();

        }

        }