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

Commit 128292b6 authored by Beverly's avatar Beverly
Browse files

Remove udfps icon hide workaround 

This logic was previously necessary to ensure the udfps icon wouldn't
show before we were fully dozing. ag/14737509 has updated the timing for
doze changes so that this is no longer necessary.

Test: manual
Bug: 190209877
Change-Id: I1be5f37c68c690972a823d5722990e5b49ac0412
parent 7bbf8633

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

+0 −18
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud 
    private boolean mQsExpanded;

    private boolean mFaceDetectRunning;

    private boolean mHintShown;

    private boolean mTransitioningFromHome;

    private int mStatusBarState;



    /**
@@ -127,7 +126,6 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud 


        mStatusBarStateController.removeCallback(mStateListener);

        mKeyguardViewManager.removeAlternateAuthInterceptor(mAlternateAuthInterceptor);

        mTransitioningFromHome = false;

        mKeyguardUpdateMonitor.requestFaceAuthOnOccludingApp(false);



        if (mCancelDelayedHintRunnable != null) {
@@ -141,7 +139,6 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud 
        super.dump(fd, pw, args);

        pw.println("mShowingUdfpsBouncer=" + mShowingUdfpsBouncer);

        pw.println("mFaceDetectRunning=" + mFaceDetectRunning);

        pw.println("mTransitioningFromHomeToKeyguard=" + mTransitioningFromHome);

        pw.println("mStatusBarState=" + StatusBarState.toShortString(mStatusBarState));

        pw.println("mQsExpanded=" + mQsExpanded);

        pw.println("mIsBouncerVisible=" + mIsBouncerVisible);
@@ -195,10 +192,6 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud 
            return true;

        }



        if (mTransitioningFromHome && mKeyguardViewMediator.isAnimatingScreenOff()) {

            return true;

        }



        if (mQsExpanded) {

            return true;

        }
@@ -277,17 +270,6 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud 
        public void onDozeAmountChanged(float linear, float eased) {

            if (linear != 0) showUdfpsBouncer(false);

            mView.onDozeAmountChanged(linear, eased);

            if (linear == 1f) {

                // transition has finished

                mTransitioningFromHome = false;

            }

            updatePauseAuth();

        }



        @Override

        public void onStatePreChange(int oldState, int newState) {

            mTransitioningFromHome = oldState == StatusBarState.SHADE

                    && newState == StatusBarState.KEYGUARD;

            updatePauseAuth();

        }