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

Commit 796e2de4 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:... 

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

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



Change-Id: I09eae17a97144996849674317abdd26cbdea24e0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1840eb42 ea3ad8e4

packages/SystemUI/res/values/strings.xml

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

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

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