Merge "Use the right message for pattern/password." into lmp-mr1-dev

This commit is contained in:
Paul Crowley
2014-11-08 01:13:10 +00:00
committed by Android (Google) Code Review

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);
} }
} }