commit c44ad35e51db79721821817e1b8e52dce632d2bf
author Paul Crowley <paulcrowley@google.com> Sat Nov 08 01:13:10 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Nov 08 01:13:11 2014 +0000
tree a6559e3c5dac4c3a594bf84208f4b93656372adc
parent ab82c090d1f4549a256d4550b71c540b216e0a65
parent a8c760691de4ecdc15e856324cc123d1af9aeaed

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

src/com/android/settings/CryptKeeper.java

diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index fa63a74..eded55b 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -237,9 +237,9 @@
                         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);
                         }
                     }