Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I461b62c1c6db6cfc54d6b8f328a15447b756ec01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-11-10 18:58:52 +00:00
committed by Automerger Merge Worker
parent 3995eaa1c9 d7fb6924f6
commit ddc630b4e8
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values/strings.xml
View File

@@ -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] -->

3
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
View File

@@ -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);
}
}

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

@@ -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();