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

Commit 88d812ed authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move all bouncer strings to a helper class that can be reused by both... 

Merge "Move all bouncer strings to a helper class that can be reused by both legacy and flexiglass implementations." into main
parents 9a51c141 edfcbdb1

packages/SystemUI/res-keyguard/values/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -304,6 +304,15 @@ 
    <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->

    <string name="kg_prompt_reason_timeout_password">For additional security, use password instead</string>



    <!-- An explanation text that the pin needs to be provided to enter the device for security reasons. [CHAR LIMIT=70] -->

    <string name="kg_prompt_added_security_pin">PIN required for additional security</string>



    <!-- An explanation text that the pattern needs to be provided to enter the device for security reasons. [CHAR LIMIT=70] -->

    <string name="kg_prompt_added_security_pattern">Pattern required for additional security</string>



    <!-- An explanation text that the password needs to be provided to enter the device for security reasons. [CHAR LIMIT=70] -->

    <string name="kg_prompt_added_security_password">Password required for additional security</string>



    <!-- An explanation text that the credential needs to be entered because a device admin has

    locked the device. [CHAR LIMIT=80] -->

    <string name="kg_prompt_reason_device_admin">Device locked by admin</string>

packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView { 
            case PROMPT_REASON_USER_REQUEST:

                return R.string.kg_prompt_after_user_lockdown_password;

            case PROMPT_REASON_PREPARE_FOR_UPDATE:

                return R.string.kg_prompt_reason_timeout_password;

                return R.string.kg_prompt_added_security_password;

            case PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT:

                return R.string.kg_prompt_reason_timeout_password;

            case PROMPT_REASON_TRUSTAGENT_EXPIRED:

packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ public class KeyguardPatternViewController 
                resId = R.string.kg_prompt_after_user_lockdown_pattern;

                break;

            case PROMPT_REASON_PREPARE_FOR_UPDATE:

                resId = R.string.kg_prompt_reason_timeout_pattern;

                resId = R.string.kg_prompt_added_security_pattern;

                break;

            case PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT:

                resId = R.string.kg_prompt_reason_timeout_pattern;

packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView 
            case PROMPT_REASON_USER_REQUEST:

                return R.string.kg_prompt_after_user_lockdown_pin;

            case PROMPT_REASON_PREPARE_FOR_UPDATE:

                return R.string.kg_prompt_reason_timeout_pin;

                return R.string.kg_prompt_added_security_pin;

            case PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT:

                return R.string.kg_prompt_reason_timeout_pin;

            case PROMPT_REASON_TRUSTAGENT_EXPIRED:

packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractor.kt

+105 −339

File changed.

Preview size limit exceeded, changes collapsed.