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

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

Browse Source 
automerge: c44ad35

* commit 'c44ad35e51db79721821817e1b8e52dce632d2bf':
  Use the right message for pattern/password.
This commit is contained in:
Paul Crowley
2014-11-08 02:27:33 +00:00
committed by android-build-merger
parent fca698cbeb c44ad35e51
commit 40597ca0e1
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) {
status.setText(R.string.cryptkeeper_wrong_pin);
} else if (passwordType == StorageManager.CRYPT_TYPE_PATTERN) {
status.setText(R.string.cryptkeeper_wrong_password);
status.setText(R.string.cryptkeeper_wrong_pattern);
} else {
status.setText(R.string.cryptkeeper_wrong_pin);
status.setText(R.string.cryptkeeper_wrong_password);
}
}