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

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

Merge "Show the "Face unlock unavailable" message on bouncer as well" into... 

Merge "Show the "Face unlock unavailable" message on bouncer as well" into tm-qpr-dev am: 0f8d00ae am: d7fb6924

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



Change-Id: I461b62c1c6db6cfc54d6b8f328a15447b756ec01
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3995eaa1 d7fb6924

packages/SystemUI/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ 
    <string name="keyguard_face_failed">Can\u2019t recognize face</string>

    <!-- Message shown to suggest using fingerprint sensor to authenticate after another biometric failed. [CHAR LIMIT=25] -->

    <string name="keyguard_suggest_fingerprint">Use fingerprint instead</string>

    <!-- Message shown to inform the user that face unlock is not available. [CHAR LIMIT=25] -->

    <!-- Message shown to inform the user that face unlock is not available. [CHAR LIMIT=65] -->

    <string name="keyguard_face_unlock_unavailable">Face unlock unavailable.</string>



    <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

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

+2 −1
Original line number Diff line number Diff line
@@ -1263,7 +1263,8 @@ public class KeyguardIndicationController { 
            showErrorMessageNowOrLater(errString, followupMessage);

        } else if (!mAuthController.isUdfpsFingerDown()) {

            // On subsequent lockouts, we show a more generic locked out message.

            showBiometricMessage(mContext.getString(R.string.keyguard_face_unlock_unavailable),

            showErrorMessageNowOrLater(

                    mContext.getString(R.string.keyguard_face_unlock_unavailable),

                    followupMessage);

        }

    }

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

+15 −0
Original line number Diff line number Diff line
@@ -1420,6 +1420,21 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { 
                mContext.getString(R.string.keyguard_face_unlock_unavailable));

    }



    @Test

    public void onBiometricError_faceLockedOutSecondTimeOnBouncer_showsUnavailableMessage() {

        createController();

        onFaceLockoutError("first lockout");

        clearInvocations(mRotateTextViewController);

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



        onFaceLockoutError("second lockout");



        verify(mStatusBarKeyguardViewManager)

                .setKeyguardMessage(

                        eq(mContext.getString(R.string.keyguard_face_unlock_unavailable)),

                        any());

    }



    @Test

    public void onBiometricError_faceLockedOutSecondTimeButUdfpsActive_showsNoMessage() {

        createController();