diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-05-15 09:37:56 -0700 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2014-05-16 09:22:49 -0700 |
| commit | 04425f161761f4606370daed5f85c67506967ce0 (patch) | |
| tree | ba8c3cbc735fc6a6b7efc9d3788bc22d366f385f /src/com/android/settings/CryptKeeper.java | |
| parent | 667848b8cba4f4ef8e29984ac0ee2c5e17d995e6 (diff) | |
| download | packages_apps_Settings-04425f161761f4606370daed5f85c67506967ce0.tar.gz packages_apps_Settings-04425f161761f4606370daed5f85c67506967ce0.tar.bz2 packages_apps_Settings-04425f161761f4606370daed5f85c67506967ce0.zip | |
Fixing decryption messaging
Messaging currently implies encryption only works with PIN or password
(K functionality). Now that in L we support encryption with PIN, pattern,
password or swipe/none, we need to update the strings accordingly.
@bug 14257692
@bug 13674657
Change-Id: I055db1289c2c2750d217b50b653a7f36ff304aca
Diffstat (limited to 'src/com/android/settings/CryptKeeper.java')
| -rw-r--r-- | src/com/android/settings/CryptKeeper.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java index 1efe98f79..8392625a3 100644 --- a/src/com/android/settings/CryptKeeper.java +++ b/src/com/android/settings/CryptKeeper.java @@ -388,9 +388,11 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList public void onPostExecute(java.lang.Void v) { if(type == StorageManager.CRYPT_TYPE_PIN) { setContentView(R.layout.crypt_keeper_pin_entry); + ((TextView)findViewById(R.id.status)).setText(R.string.enter_pin); } else if (type == StorageManager.CRYPT_TYPE_PATTERN) { setContentView(R.layout.crypt_keeper_pattern_entry); setBackFunctionality(false); + ((TextView)findViewById(R.id.status)).setText(R.string.enter_pattern); } else { setContentView(R.layout.crypt_keeper_password_entry); } |