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

Commit acc82f7d authored by Austin Delgado's avatar Austin Delgado Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ic8dc7e283d568bc667b6d37a067f400660dd1d5a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aeb77b50 77f27f44

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -953,6 +953,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>

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

+7 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,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 {