nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

* commit '938c178215d38c6f085b32b0994598f9e8bc5ab5':
  Fix for hanging extension keyboard. Bug: 2593488
main
Amith Yamasani 2010-04-15 16:48:13 -07:00 committed by Android Git Automerger
parent 41c2b30a34 938c178215
commit 335a0c5511
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/src/com/android/inputmethod/latin/LatinKeyboardView.java
View File

@ -192,12 +192,12 @@ public class LatinKeyboardView extends KeyboardView {
mLastY = (int) me.getY(); mLastY = (int) me.getY();
invalidate(); invalidate();
} }
// If an extension keyboard is visible or this is an extension keyboard, don't look // 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 // for sudden jumps. Otherwise, if there was a sudden jump, return without processing the
// actual motion event. // actual motion event.
if (!mExtensionVisible && !mIsExtensionType if (!mExtensionVisible && !mIsExtensionType
&& handleSuddenJump(me)) return true; && handleSuddenJump(me)) return true;
// Reset any bounding box controls in the keyboard // Reset any bounding box controls in the keyboard
if (me.getAction() == MotionEvent.ACTION_DOWN) { if (me.getAction() == MotionEvent.ACTION_DOWN) {
keyboard.keyReleased(); keyboard.keyReleased();
@ -219,7 +219,9 @@ public class LatinKeyboardView extends KeyboardView {
if (keyboard.getExtension() == 0) { if (keyboard.getExtension() == 0) {
return super.onTouchEvent(me); 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) { if (mExtensionVisible) {
int action = me.getAction(); int action = me.getAction();
if (mFirstEvent) action = MotionEvent.ACTION_DOWN; if (mFirstEvent) action = MotionEvent.ACTION_DOWN;