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

Commit c006604c authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 774568f7: am 1ee7b645: Merge change I0743a389 into eclair-mr2 

Merge commit '774568f7'

* commit '774568f7':
  Close popup when Keyboard gets a CANCEL motion event.
parents d1879255 774568f7

core/java/android/inputmethodservice/KeyboardView.java

+2 −1
Original line number Diff line number Diff line
@@ -1127,7 +1127,7 @@ public class KeyboardView extends View implements View.OnClickListener { 
        

        // Needs to be called after the gesture detector gets a turn, as it may have

        // displayed the mini keyboard

        if (mMiniKeyboardOnScreen) {

        if (mMiniKeyboardOnScreen && action != MotionEvent.ACTION_CANCEL) {

            return true;

        }
@@ -1222,6 +1222,7 @@ public class KeyboardView extends View implements View.OnClickListener { 
                break;

            case MotionEvent.ACTION_CANCEL:

                removeMessages();

                dismissPopupKeyboard();

                mAbortKey = true;

                showPreview(NOT_A_KEY);

                invalidateKey(mCurrentKey);