PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 40597ca0: Merge "Use the right message for pattern/password." into lmp-mr1-dev automerge: c44ad35

Browse Source 
* commit '40597ca0e14dc3b5be90ff1d0c344316cffe0274':
  Use the right message for pattern/password.
This commit is contained in:
Paul Crowley
2014-11-08 03:00:06 +00:00
committed by Android Git Automerger
parent 48471e397e 40597ca0e1
commit 0475a3ccc5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/CryptKeeper.java
View File

@@ -237,9 +237,9 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
if (passwordType == StorageManager.CRYPT_TYPE_PIN) { if (passwordType == StorageManager.CRYPT_TYPE_PIN) {
status.setText(R.string.cryptkeeper_wrong_pin); status.setText(R.string.cryptkeeper_wrong_pin);
} else if (passwordType == StorageManager.CRYPT_TYPE_PATTERN) { } else if (passwordType == StorageManager.CRYPT_TYPE_PATTERN) {
status.setText(R.string.cryptkeeper_wrong_password); status.setText(R.string.cryptkeeper_wrong_pattern);
} else { } else {
status.setText(R.string.cryptkeeper_wrong_pin); status.setText(R.string.cryptkeeper_wrong_password);
} }
} }