diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-08-13 01:02:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 01:02:31 +0000 |
| commit | 73d9e1ce0bc8e4478b165fd5f550c99830fbcb57 (patch) | |
| tree | f8b49e0c5199ce5041b7ded6ec9d82b0785b6df5 /packages/Keyguard/res | |
| parent | a54d4583ec4d6b112a99c29ef71fbabfd67478cb (diff) | |
| parent | 69082a298f50680128ada89a8bef777f0fadf829 (diff) | |
| download | frameworks_base-73d9e1ce0bc8e4478b165fd5f550c99830fbcb57.zip frameworks_base-73d9e1ce0bc8e4478b165fd5f550c99830fbcb57.tar.gz frameworks_base-73d9e1ce0bc8e4478b165fd5f550c99830fbcb57.tar.bz2 | |
am 69082a29: Merge "Require strong authentication after a timeout" into mnc-dr-dev
* commit '69082a298f50680128ada89a8bef777f0fadf829':
Require strong authentication after a timeout
Diffstat (limited to 'packages/Keyguard/res')
| -rw-r--r-- | packages/Keyguard/res/values/strings.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/packages/Keyguard/res/values/strings.xml b/packages/Keyguard/res/values/strings.xml index 41b1059..d1e84f5 100644 --- a/packages/Keyguard/res/values/strings.xml +++ b/packages/Keyguard/res/values/strings.xml @@ -316,6 +316,15 @@ <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] --> <string name="kg_prompt_reason_restart_password">Password required when you restart device.</string> + <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] --> + <string name="kg_prompt_reason_timeout_pattern">Pattern required for additional security.</string> + + <!-- An explanation text that the pin 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_pin">PIN required for additional security.</string> + + <!-- 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">Password required for additional security.</string> + <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] --> <string name="kg_prompt_reason_switch_profiles_pattern">Pattern required when you switch profiles.</string> |