diff options
| author | 2023-07-25 17:30:38 +0000 | |
|---|---|---|
| committer | 2023-07-25 17:30:38 +0000 | |
| commit | 77f27f44dd22b5ed40c71caa49ce4e87a6981345 (patch) | |
| tree | 68e73aee1af424554d7e4b84b6f3268dd4305b8a | |
| parent | 2b0765ae5bf71a1672f693090b6baad9b7935e31 (diff) | |
| parent | 2a6d4eea164479e07737a5bddf761c93c7f79962 (diff) | |
Merge "Add new Face unlock retry talkback string" into udc-d1-dev
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 8e205f6bff41..dc3ab05c713a 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -946,6 +946,8 @@ <!-- 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> + <!-- 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] --> <string name="require_unlock_for_nfc">Unlock to use NFC</string> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java index b847fb6ded83..03c458918f4b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java @@ -1002,7 +1002,13 @@ public class KeyguardIndicationController { return; // udfps affordance is highlighted, no need to show action to unlock } else if (mKeyguardUpdateMonitor.isFaceEnrolled() && !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); } } else { |