diff options
author | Jim Miller <jaggies@google.com> | 2011-04-15 18:52:31 -0700 |
---|---|---|
committer | Jim Miller <jaggies@google.com> | 2011-04-15 18:52:31 -0700 |
commit | 74b1e0a7330af195621ad0965748bee66c46f4b6 (patch) | |
tree | 5f4c959ca923b1cc7fe08cd30aa8957292387955 /src/com/android/settings/ConfirmLockPassword.java | |
parent | 2c701570ebfbccc5a6a2ed271c965f75ed2149f0 (diff) | |
download | packages_apps_settings-74b1e0a7330af195621ad0965748bee66c46f4b6.zip packages_apps_settings-74b1e0a7330af195621ad0965748bee66c46f4b6.tar.gz packages_apps_settings-74b1e0a7330af195621ad0965748bee66c46f4b6.tar.bz2 |
Fix 4283049: Restore continue/cancel buttons in LockScreen Settings
This fixes a bug where the continue/cancel buttons were missing
from LockScreen settings in landscape mode.
The change also includes a minor change to enable using the IME enter
key to proceed to the next step.
Change-Id: I2dca0b40e38a128cc0aa637f573da01e779edb73
Diffstat (limited to 'src/com/android/settings/ConfirmLockPassword.java')
-rw-r--r-- | src/com/android/settings/ConfirmLockPassword.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java index 3f4a4f3..7b7b103 100644 --- a/src/com/android/settings/ConfirmLockPassword.java +++ b/src/com/android/settings/ConfirmLockPassword.java @@ -173,8 +173,10 @@ public class ConfirmLockPassword extends PreferenceActivity { } public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { - // Check if this was the result of hitting the enter key - if (actionId == EditorInfo.IME_NULL) { + // Check if this was the result of hitting the enter or "done" key + if (actionId == EditorInfo.IME_NULL + || actionId == EditorInfo.IME_ACTION_DONE + || actionId == EditorInfo.IME_ACTION_NEXT) { handleNext(); return true; } |