diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-12-07 23:31:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-07 23:31:03 -0800 |
| commit | 03e634270d880407316b51fac2278e604fc82703 (patch) | |
| tree | eb44e68e794ff05b6ae5fe08dcc86a5702b89bc8 /core/java/android/view/ViewRootImpl.java | |
| parent | 944c985b4199e6e029568ea87004c9727e469cc0 (diff) | |
| parent | 8e0ecbfc97606ea30d0d8216fea635888f766b9d (diff) | |
| download | frameworks_base-03e634270d880407316b51fac2278e604fc82703.zip frameworks_base-03e634270d880407316b51fac2278e604fc82703.tar.gz frameworks_base-03e634270d880407316b51fac2278e604fc82703.tar.bz2 | |
am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1
* commit '8e0ecbfc97606ea30d0d8216fea635888f766b9d':
Shortcut keys should be handled on down, not up.
Diffstat (limited to 'core/java/android/view/ViewRootImpl.java')
| -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 7f5b5be..6c982eb 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -3330,8 +3330,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)) { finishKeyEvent(event, sendDone, true); |