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

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

Merge "NotificationShade should animate away on MODE_UNLOCK_COLLAPSING" into... 

Merge "NotificationShade should animate away on MODE_UNLOCK_COLLAPSING" into sc-qpr1-dev am: a22f94bd

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

Change-Id: I5618bab161f93e66f2620cf7804efda27638e731
parents c7bccb0b a22f94bd

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

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


    /**

     * Mode in which fingerprint unlocks the device or passive auth (ie face auth) unlocks the

     * device while being requested when keyguard is occluded.

     * device while being requested when keyguard is occluded or showing.

     */

    public static final int MODE_UNLOCK_COLLAPSING = 5;
@@ -425,6 +425,11 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp 
                if (!wasDeviceInteractive) {

                    mPendingShowBouncer = true;

                } else {

                    mShadeController.animateCollapsePanels(

                            CommandQueue.FLAG_EXCLUDE_NONE,

                            true /* force */,

                            false /* delayed */,

                            BIOMETRIC_COLLAPSE_SPEEDUP_FACTOR);

                    mPendingShowBouncer = false;

                    mKeyguardViewController.notifyKeyguardAuthenticated(

                            false /* strongAuth */);

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

+20 −0
Original line number Diff line number Diff line
@@ -273,6 +273,26 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase { 
                .isEqualTo(BiometricUnlockController.MODE_SHOW_BOUNCER);

    }



    @Test

    public void onBiometricAuthenticated_onLockScreen() {

        // GIVEN not dozing

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



        // WHEN we want to unlock collapse

        mBiometricUnlockController.startWakeAndUnlock(

                BiometricUnlockController.MODE_UNLOCK_COLLAPSING);



        // THEN we collpase the panels and notify authenticated

        verify(mShadeController).animateCollapsePanels(

                /* flags */ anyInt(),

                /* force */ eq(true),

                /* delayed */ eq(false),

                /* speedUpFactor */ anyFloat()

        );

        verify(mStatusBarKeyguardViewManager).notifyKeyguardAuthenticated(

                /* strongAuth */ eq(false));

    }



    @Test

    public void onBiometricAuthenticated_whenFace_noBypass_encrypted_doNothing() {

        reset(mUpdateMonitor);