diff options
Diffstat (limited to 'src/com/android/settings/CryptKeeper.java')
| -rw-r--r-- | src/com/android/settings/CryptKeeper.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java index edf00d5..20bf7ce 100644 --- a/src/com/android/settings/CryptKeeper.java +++ b/src/com/android/settings/CryptKeeper.java @@ -342,9 +342,11 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList KeyboardView keyboardView = (PasswordEntryKeyboardView) findViewById(R.id.keyboard); - PasswordEntryKeyboardHelper keyboardHelper = new PasswordEntryKeyboardHelper(this, - keyboardView, mPasswordEntry, false); - keyboardHelper.setKeyboardMode(PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA); + if (keyboardView != null) { + PasswordEntryKeyboardHelper keyboardHelper = new PasswordEntryKeyboardHelper(this, + keyboardView, mPasswordEntry, false); + keyboardHelper.setKeyboardMode(PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA); + } } private IMountService getMountService() { @@ -357,7 +359,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList @Override public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { - if (actionId == EditorInfo.IME_NULL) { + if (actionId == EditorInfo.IME_NULL || actionId == EditorInfo.IME_ACTION_DONE) { // Get the password String password = v.getText().toString(); |