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

Merge "Add new Face unlock retry talkback string" into udc-d1-dev am: 77f27f44dd

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

Change-Id: I38cb262e8605d868d9410fff3d03003088731d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Austin Delgado
2023-07-25 18:02:47 +00:00
committed by Automerger Merge Worker
parent ff3df4a69d 77f27f44dd
commit a1044fd84d
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -946,6 +946,8 @@
<!-- Message shown when face authentication fails and the pin pad is visible. [CHAR LIMIT=60] --> <!-- Message shown when face authentication fails and the pin pad is visible. [CHAR LIMIT=60] -->
<string name="keyguard_retry">Swipe up to try again</string> <string name="keyguard_retry">Swipe up to try again</string>
<!-- Message shown when face authentication fails and the pin pad is visible. [CHAR LIMIT=60] -->
<string name="accesssibility_keyguard_retry">Swipe up to try Face Unlock again</string>
<!-- Message shown when notifying user to unlock in order to use NFC. [CHAR LIMIT=60] --> <!-- Message shown when notifying user to unlock in order to use NFC. [CHAR LIMIT=60] -->
<string name="require_unlock_for_nfc">Unlock to use NFC</string> <string name="require_unlock_for_nfc">Unlock to use NFC</string>

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

@@ -1002,7 +1002,13 @@ public class KeyguardIndicationController {
return; // udfps affordance is highlighted, no need to show action to unlock return; // udfps affordance is highlighted, no need to show action to unlock
} else if (mKeyguardUpdateMonitor.isFaceEnrolled() } else if (mKeyguardUpdateMonitor.isFaceEnrolled()
&& !mKeyguardUpdateMonitor.getIsFaceAuthenticated()) { && !mKeyguardUpdateMonitor.getIsFaceAuthenticated()) {
String message = mContext.getString(R.string.keyguard_retry); String message;
if (mAccessibilityManager.isEnabled()
|| mAccessibilityManager.isTouchExplorationEnabled()) {
message = mContext.getString(R.string.accesssibility_keyguard_retry);
} else {
message = mContext.getString(R.string.keyguard_retry);
}
mStatusBarKeyguardViewManager.setKeyguardMessage(message, mInitialTextColorState); mStatusBarKeyguardViewManager.setKeyguardMessage(message, mInitialTextColorState);
} }
} else { } else {