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

Commit 616fbc50 authored by Beverly Tai's avatar Beverly Tai
Browse files

Revert "Remove ScrimController from BiometricUnlockController" 

Revert submission 20691780-cherrypick-modernize_alt_bouncer-2av1xvqe7q

Reason for revert: breaking build (see b/262237315)
Reverted Changes:
Ic4c4837cd:Remove ScrimController from BiometricUnlockControl...
I041db358a:Add entry for modern alternate bouncer toggle
I400a27e8f:Update ArcSBKVM constructor
Ia975fd65d:Modernize alternate bouncer logic
I0e15b8796:Update constructors

Change-Id: If24ae9d9fe1035e2af5b9c822cd1f66128f11823
parent 8f35f7b0

packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java

+10 −2
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp 
    private KeyguardViewController mKeyguardViewController;

    private DozeScrimController mDozeScrimController;

    private KeyguardViewMediator mKeyguardViewMediator;

    private ScrimController mScrimController;

    private PendingAuthenticated mPendingAuthenticated = null;

    private boolean mHasScreenTurnedOnSinceAuthenticating;

    private boolean mFadedAwayAfterWakeAndUnlock;
@@ -255,7 +256,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp 
    @Inject

    public BiometricUnlockController(

            DozeScrimController dozeScrimController,

            KeyguardViewMediator keyguardViewMediator,

            KeyguardViewMediator keyguardViewMediator, ScrimController scrimController,

            NotificationShadeWindowController notificationShadeWindowController,

            KeyguardStateController keyguardStateController, Handler handler,

            KeyguardUpdateMonitor keyguardUpdateMonitor,
@@ -284,6 +285,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp 
        mNotificationShadeWindowController = notificationShadeWindowController;

        mDozeScrimController = dozeScrimController;

        mKeyguardViewMediator = keyguardViewMediator;

        mScrimController = scrimController;

        mKeyguardStateController = keyguardStateController;

        mHandler = handler;

        mConsecutiveFpFailureThreshold = resources.getInteger(
@@ -364,6 +366,12 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp 
        Trace.endSection();

    }



    private boolean pulsingOrAod() {

        final ScrimState scrimState = mScrimController.getState();

        return scrimState == ScrimState.AOD

                || scrimState == ScrimState.PULSING;

    }



    @Override

    public void onBiometricAuthenticated(int userId, BiometricSourceType biometricSourceType,

            boolean isStrongBiometric) {
@@ -408,7 +416,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp 
        boolean wasDeviceInteractive = mUpdateMonitor.isDeviceInteractive();

        mMode = mode;

        mHasScreenTurnedOnSinceAuthenticating = false;

        if (mMode == MODE_WAKE_AND_UNLOCK_PULSING) {

        if (mMode == MODE_WAKE_AND_UNLOCK_PULSING && pulsingOrAod()) {

            // If we are waking the device up while we are pulsing the clock and the

            // notifications would light up first, creating an unpleasant animation.

            // Defer changing the screen brightness by forcing doze brightness on our window

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/BiometricsUnlockControllerTest.java

+3 −1
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase { 
    @Mock

    private KeyguardViewMediator mKeyguardViewMediator;

    @Mock

    private ScrimController mScrimController;

    @Mock

    private BiometricUnlockController.BiometricModeListener mBiometricModeListener;

    @Mock

    private KeyguardStateController mKeyguardStateController;
@@ -131,7 +133,7 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase { 
        when(mVibratorHelper.hasVibrator()).thenReturn(true);

        mDependency.injectTestDependency(NotificationMediaManager.class, mMediaManager);

        mBiometricUnlockController = new BiometricUnlockController(mDozeScrimController,

                mKeyguardViewMediator,

                mKeyguardViewMediator, mScrimController,

                mNotificationShadeWindowController, mKeyguardStateController, mHandler,

                mUpdateMonitor, res.getResources(), mKeyguardBypassController,

                mMetricsLogger, mDumpManager, mPowerManager, mLogger,