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

Commit 6c6ad7de authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Show scrimmed bouncer from BiometricUnlockCtrl" into sc-v2-dev am: 83334b67 am: 8423874e 

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

Change-Id: I0bcfe1052907544fc42139ddea6d43f15bffb6ec
parents b6f175f1 8423874e

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

+1 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp 


    private void showBouncer() {

        if (mMode == MODE_SHOW_BOUNCER) {

            mKeyguardViewController.showBouncer(false);

            mKeyguardViewController.showBouncer(true);

        }

        mShadeController.animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */,

                false /* delayed */, BIOMETRIC_COLLAPSE_SPEEDUP_FACTOR);

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

+4 −4
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase { 
                .thenReturn(false);

        mBiometricUnlockController.onBiometricAuthenticated(UserHandle.USER_CURRENT,

                BiometricSourceType.FINGERPRINT, true /* isStrongBiometric */);

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

        verify(mStatusBarKeyguardViewManager).showBouncer(anyBoolean());

        verify(mStatusBarKeyguardViewManager, never()).notifyKeyguardAuthenticated(anyBoolean());

        assertThat(mBiometricUnlockController.getMode())

                .isEqualTo(BiometricUnlockController.MODE_SHOW_BOUNCER);
@@ -146,7 +146,7 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase { 
                .thenReturn(false);

        mBiometricUnlockController.onBiometricAuthenticated(UserHandle.USER_CURRENT,

                BiometricSourceType.FINGERPRINT, false /* isStrongBiometric */);

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

        verify(mStatusBarKeyguardViewManager).showBouncer(anyBoolean());

        verify(mShadeController).animateCollapsePanels(anyInt(), anyBoolean(), anyBoolean(),

                anyFloat());

        assertThat(mBiometricUnlockController.getMode())
@@ -265,10 +265,10 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase { 
                BiometricSourceType.FACE, true /* isStrongBiometric */);



        // Wake up before showing the bouncer

        verify(mStatusBarKeyguardViewManager, never()).showBouncer(eq(false));

        verify(mStatusBarKeyguardViewManager, never()).showBouncer(anyBoolean());

        mBiometricUnlockController.mWakefulnessObserver.onFinishedWakingUp();



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

        verify(mStatusBarKeyguardViewManager).showBouncer(anyBoolean());

        assertThat(mBiometricUnlockController.getMode())

                .isEqualTo(BiometricUnlockController.MODE_SHOW_BOUNCER);

    }