Merge "Remove Meta-Tab shortcut for Recents." into lmp-dev

This commit is contained in:
Michael Wright
2014-08-25 19:29:47 +00:00
committed by Android (Google) Code Review

View File

@@ -2470,13 +2470,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
}
// Display task switcher for ALT-TAB or Meta-TAB.
// Display task switcher for ALT-TAB.
if (down && repeatCount == 0 && keyCode == KeyEvent.KEYCODE_TAB) {
if (mRecentAppsHeldModifiers == 0 && !keyguardOn) {
final int shiftlessModifiers = event.getModifiers() & ~KeyEvent.META_SHIFT_MASK;
if (KeyEvent.metaStateHasModifiers(shiftlessModifiers, KeyEvent.META_ALT_ON)
|| KeyEvent.metaStateHasModifiers(
shiftlessModifiers, KeyEvent.META_META_ON)) {
if (KeyEvent.metaStateHasModifiers(shiftlessModifiers, KeyEvent.META_ALT_ON)) {
mRecentAppsHeldModifiers = shiftlessModifiers;
showRecentApps(true);
return -1;