Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: be3deb8

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

Change-Id: If0a48bb2fcc93791e7cf391cdb98c7425cbfd140
This commit is contained in:
Adrian Roos
2016-04-13 23:13:25 +00:00
committed by android-build-merger
parent 89523df12e be3deb8198
commit b18273fce4
4 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/Keyguard/res/values/strings.xml
View File

@@ -334,6 +334,14 @@
<!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] --> <!-- 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> <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]--> <!-- 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"> <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> <item quantity="one">Device hasn\'t been unlocked for <xliff:g id="number">%d</xliff:g> hour. Confirm pattern.</item>

4
packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java
View File

@@ -117,6 +117,10 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView
return R.string.kg_prompt_reason_restart_password; return R.string.kg_prompt_reason_restart_password;
case PROMPT_REASON_TIMEOUT: case PROMPT_REASON_TIMEOUT:
return R.string.kg_prompt_reason_timeout_password; 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: case PROMPT_REASON_NONE:
return 0; return 0;
default: default:

8
packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
View File

@@ -339,6 +339,14 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit
mSecurityMessageDisplay.setMessage(R.string.kg_prompt_reason_timeout_pattern, mSecurityMessageDisplay.setMessage(R.string.kg_prompt_reason_timeout_pattern,
true /* important */); true /* important */);
break; 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: case PROMPT_REASON_NONE:
break; break;
default: default:

4
packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java
View File

@@ -108,6 +108,10 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView
return R.string.kg_prompt_reason_restart_pin; return R.string.kg_prompt_reason_restart_pin;
case PROMPT_REASON_TIMEOUT: case PROMPT_REASON_TIMEOUT:
return R.string.kg_prompt_reason_timeout_pin; 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: case PROMPT_REASON_NONE:
return 0; return 0;
default: default: