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

Commit ed3a98e8 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Dismiss bouncer properly on SHADE_LOCKED" into qt-r1-dev 

am: 6b068a4f

Change-Id: I4972f75cfeb5ad434a4b6240dd41414a0b24e35b
parents fb3cc93d 6b068a4f

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

+5 −2
Original line number Diff line number Diff line
@@ -467,8 +467,11 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback { 
        }

        if (mStatusBarKeyguardViewManager.isShowing()) {

            if (mStatusBarKeyguardViewManager.bouncerIsOrWillBeShowing() && unlockingAllowed) {

                return bypass && !mKeyguardBypassController.canPlaySubtleWindowAnimations()

                        ? MODE_UNLOCK_COLLAPSING : MODE_UNLOCK_FADING;

                if (bypass && mKeyguardBypassController.canPlaySubtleWindowAnimations()) {

                    return MODE_UNLOCK_FADING;

                } else {

                    return MODE_DISMISS_BOUNCER;

                }

            } else if (unlockingAllowed) {

                return bypass ? MODE_UNLOCK_FADING : MODE_NONE;

            } else {

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

+30 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.systemui.statusbar.phone;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyFloat;
@@ -191,6 +193,34 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase { 
        verify(mStatusBarKeyguardViewManager).notifyKeyguardAuthenticated(eq(false));

    }



    @Test

    public void onBiometricAuthenticated_whenBypassOnBouncer_dismissBouncer() {

        reset(mKeyguardBypassController);

        when(mUpdateMonitor.isUnlockingWithBiometricAllowed()).thenReturn(true);

        when(mKeyguardBypassController.getBypassEnabled()).thenReturn(true);

        when(mKeyguardBypassController.onBiometricAuthenticated(any())).thenReturn(true);

        when(mStatusBarKeyguardViewManager.bouncerIsOrWillBeShowing()).thenReturn(true);

        mBiometricUnlockController.onBiometricAuthenticated(UserHandle.USER_CURRENT,

                BiometricSourceType.FACE);



        verify(mStatusBarKeyguardViewManager).notifyKeyguardAuthenticated(eq(false));

        assertThat(mBiometricUnlockController.getMode())

                .isEqualTo(BiometricUnlockController.MODE_DISMISS_BOUNCER);

    }



    @Test

    public void onBiometricAuthenticated_whenBypassOnBouncer_respectsCanPlaySubtleAnim() {

        when(mUpdateMonitor.isUnlockingWithBiometricAllowed()).thenReturn(true);

        when(mKeyguardBypassController.getBypassEnabled()).thenReturn(true);

        when(mStatusBarKeyguardViewManager.bouncerIsOrWillBeShowing()).thenReturn(true);

        mBiometricUnlockController.onBiometricAuthenticated(UserHandle.USER_CURRENT,

                BiometricSourceType.FACE);



        verify(mStatusBarKeyguardViewManager).notifyKeyguardAuthenticated(eq(false));

        assertThat(mBiometricUnlockController.getMode())

                .isEqualTo(BiometricUnlockController.MODE_UNLOCK_FADING);

    }



    @Test

    public void onBiometricAuthenticated_whenFaceAndPulsing_dontDismissKeyguard() {

        reset(mUpdateMonitor);