diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-12-09 14:25:41 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-09 14:25:41 -0800 |
| commit | bdc18b28eb04b8c8cc00313096f8bfb142e407e3 (patch) | |
| tree | e41f9646de276f365c054919031d6433aa15079d /core | |
| parent | fa7fa9a5ba796eabb2dadb8e2ce1b97da38e939e (diff) | |
| parent | 03e634270d880407316b51fac2278e604fc82703 (diff) | |
| download | frameworks_base-bdc18b28eb04b8c8cc00313096f8bfb142e407e3.zip frameworks_base-bdc18b28eb04b8c8cc00313096f8bfb142e407e3.tar.gz frameworks_base-bdc18b28eb04b8c8cc00313096f8bfb142e407e3.tar.bz2 | |
am 03e63427: am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1
* commit '03e634270d880407316b51fac2278e604fc82703':
Shortcut keys should be handled on down, not up.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 7a9d82c..72966ef 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -3257,8 +3257,9 @@ public final class ViewRootImpl extends Handler implements ViewParent, } // If the Control modifier is held, try to interpret the key as a shortcut. - if (event.getAction() == KeyEvent.ACTION_UP + if (event.getAction() == KeyEvent.ACTION_DOWN && event.isCtrlPressed() + && event.getRepeatCount() == 0 && !KeyEvent.isModifierKey(event.getKeyCode())) { if (mView.dispatchKeyShortcutEvent(event)) { finishInputEvent(q, true); |