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

Commit 6ce74baf authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "[Bouncer] Only show swipe up and try again..." into tm-qpr-dev am: e0929fa9 am: aa12d42a 

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



Change-Id: Id9847be4e93a80d3a6981c44f6bae5c9ad6a1f36
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d14721cd aa12d42a

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+2 −1
Original line number Diff line number Diff line
@@ -946,7 +946,8 @@ public class KeyguardIndicationController { 
        if (mStatusBarKeyguardViewManager.isBouncerShowing()) {

            if (mAlternateBouncerInteractor.isVisibleState()) {

                return; // udfps affordance is highlighted, no need to show action to unlock

            } else if (mKeyguardUpdateMonitor.isFaceEnrolled()) {

            } else if (mKeyguardUpdateMonitor.isFaceEnrolled()

                    && !mKeyguardUpdateMonitor.getIsFaceAuthenticated()) {

                String message = mContext.getString(R.string.keyguard_retry);

                mStatusBarKeyguardViewManager.setKeyguardMessage(message, mInitialTextColorState);

            }

packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java

+16 −0
Original line number Diff line number Diff line
@@ -676,6 +676,7 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { 
        String message = mContext.getString(R.string.keyguard_retry);

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

        when(mKeyguardUpdateMonitor.isFaceEnrolled()).thenReturn(true);

        when(mKeyguardUpdateMonitor.getIsFaceAuthenticated()).thenReturn(false);



        mController.setVisible(true);

        mController.getKeyguardCallback().onBiometricError(FACE_ERROR_TIMEOUT,
@@ -684,6 +685,21 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { 
        verify(mStatusBarKeyguardViewManager).setKeyguardMessage(eq(message), any());

    }



    @Test

    public void transientIndication_swipeUpToRetry_faceAuthenticated() {

        createController();

        String message = mContext.getString(R.string.keyguard_retry);

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

        when(mKeyguardUpdateMonitor.getIsFaceAuthenticated()).thenReturn(true);

        when(mKeyguardUpdateMonitor.isFaceEnrolled()).thenReturn(true);



        mController.setVisible(true);

        mController.getKeyguardCallback().onBiometricError(FACE_ERROR_TIMEOUT,

                "A message", BiometricSourceType.FACE);



        verify(mStatusBarKeyguardViewManager, never()).setKeyguardMessage(eq(message), any());

    }



    @Test

    public void faceErrorTimeout_whenFingerprintEnrolled_doesNotShowMessage() {

        createController();