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

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

am 938c1782: Fix for hanging extension keyboard. Bug: 2593488 

Merge commit '938c1782' into froyo-plus-aosp

* commit '938c1782':
  Fix for hanging extension keyboard. Bug: 2593488
parents 41c2b30a 938c1782

java/src/com/android/inputmethod/latin/LatinKeyboardView.java

+4 −2
Original line number Diff line number Diff line
@@ -192,12 +192,12 @@ public class LatinKeyboardView extends KeyboardView { 
            mLastY = (int) me.getY();

            invalidate();

        }



        // If an extension keyboard is visible or this is an extension keyboard, don't look

        // for sudden jumps. Otherwise, if there was a sudden jump, return without processing the

        // actual motion event.

        if (!mExtensionVisible && !mIsExtensionType

                && handleSuddenJump(me)) return true;



        // Reset any bounding box controls in the keyboard

        if (me.getAction() == MotionEvent.ACTION_DOWN) {

            keyboard.keyReleased();
@@ -219,7 +219,9 @@ public class LatinKeyboardView extends KeyboardView { 
        if (keyboard.getExtension() == 0) {

            return super.onTouchEvent(me);

        }

        if (me.getY() < 0) {

        // If the motion event is above the keyboard and it's not an UP event coming

        // even before the first MOVE event into the extension area

        if (me.getY() < 0 && (mExtensionVisible || me.getAction() != MotionEvent.ACTION_UP)) {

            if (mExtensionVisible) {

                int action = me.getAction();

                if (mFirstEvent) action = MotionEvent.ACTION_DOWN;