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

Commit addfa24a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove udfps icon hide workaround" into sc-dev am: 04d993bb am: 0ef358ba am: 77b540b5 

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

Change-Id: I609b8fcbc136c3ccb54bae2b00185541b1c697a5
parents af4366c7 77b540b5

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();

        }