Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I0743a389 into eclair-mr2

Browse Source 
* changes:
  Close popup when Keyboard gets a CANCEL motion event.
This commit is contained in:
Android (Google) Code Review
2009-12-08 14:37:38 -08:00
parent a5ba0a7881 0743a389e8
commit 1ee7b6453a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/inputmethodservice/KeyboardView.java
View File

@@ -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 // Needs to be called after the gesture detector gets a turn, as it may have
// displayed the mini keyboard // displayed the mini keyboard
if (mMiniKeyboardOnScreen) { if (mMiniKeyboardOnScreen && action != MotionEvent.ACTION_CANCEL) {
return true; return true;
} }
@@ -1222,6 +1222,7 @@ public class KeyboardView extends View implements View.OnClickListener {
break; break;
case MotionEvent.ACTION_CANCEL: case MotionEvent.ACTION_CANCEL:
removeMessages(); removeMessages();
dismissPopupKeyboard();
mAbortKey = true; mAbortKey = true;
showPreview(NOT_A_KEY); showPreview(NOT_A_KEY);
invalidateKey(mCurrentKey); invalidateKey(mCurrentKey);