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

Commit b18273fc authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "Improved trust error messaging (2/2)" into nyc-dev 

am: be3deb81

* commit 'be3deb81':
  Improved trust error messaging (2/2)

Change-Id: If0a48bb2fcc93791e7cf391cdb98c7425cbfd140
parents 89523df1 be3deb81

packages/Keyguard/res/values/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -334,6 +334,14 @@ 
    <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->

    <string name="kg_prompt_reason_switch_profiles_password">Password required when you switch profiles</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 administrator locked device</string>



    <!-- An explanation text that the credential needs to be entered because the user has clicked

     the force lock button. [CHAR LIMIT=80] -->

    <string name="kg_prompt_reason_user_request">Device was locked manually</string>



    <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->

    <plurals name="kg_prompt_reason_time_pattern">

        <item quantity="one">Device hasn\'t been unlocked for <xliff:g id="number">%d</xliff:g> hour. Confirm pattern.</item>

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

+4 −0
Original line number Diff line number Diff line
@@ -117,6 +117,10 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView 
                return R.string.kg_prompt_reason_restart_password;

            case PROMPT_REASON_TIMEOUT:

                return R.string.kg_prompt_reason_timeout_password;

            case PROMPT_REASON_DEVICE_ADMIN:

                return R.string.kg_prompt_reason_device_admin;

            case PROMPT_REASON_USER_REQUEST:

                return R.string.kg_prompt_reason_user_request;

            case PROMPT_REASON_NONE:

                return 0;

            default:

packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java

+8 −0
Original line number Diff line number Diff line
@@ -339,6 +339,14 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit 
                mSecurityMessageDisplay.setMessage(R.string.kg_prompt_reason_timeout_pattern,

                        true /* important */);

                break;

            case PROMPT_REASON_DEVICE_ADMIN:

                mSecurityMessageDisplay.setMessage(R.string.kg_prompt_reason_device_admin,

                        true /* important */);

                break;

            case PROMPT_REASON_USER_REQUEST:

                mSecurityMessageDisplay.setMessage(R.string.kg_prompt_reason_user_request,

                        true /* important */);

                break;

            case PROMPT_REASON_NONE:

                break;

            default:

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

+4 −0
Original line number Diff line number Diff line
@@ -108,6 +108,10 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView 
                return R.string.kg_prompt_reason_restart_pin;

            case PROMPT_REASON_TIMEOUT:

                return R.string.kg_prompt_reason_timeout_pin;

            case PROMPT_REASON_DEVICE_ADMIN:

                return R.string.kg_prompt_reason_device_admin;

            case PROMPT_REASON_USER_REQUEST:

                return R.string.kg_prompt_reason_user_request;

            case PROMPT_REASON_NONE:

                return 0;

            default: