Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af37450f authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 52403d6f: Merge "Fix "Wrong password" message shown when using BT keyboard." into lmp-dev 

* commit '52403d6f':
  Fix "Wrong password" message shown when using BT keyboard.
parents e95638f5 52403d6f

packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java

+8 −2
Original line number Diff line number Diff line
@@ -295,8 +295,14 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView 
    @Override

    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 || actionId == EditorInfo.IME_ACTION_DONE

                || actionId == EditorInfo.IME_ACTION_NEXT) {

        final boolean isSoftImeEvent = event == null

                && (actionId == EditorInfo.IME_NULL

                || actionId == EditorInfo.IME_ACTION_DONE

                || actionId == EditorInfo.IME_ACTION_NEXT);

        final boolean isKeyboardEnterKey = event != null

                && KeyEvent.isConfirmKey(event.getKeyCode())

                && event.getAction() == KeyEvent.ACTION_DOWN;

        if (isSoftImeEvent || isKeyboardEnterKey) {

            verifyPasswordAndUnlock();

            return true;

        }