DO NOT MERGE. Prevent recents from coming up when in SUW

am: 84669ca8de

* commit '84669ca8de55d38073a0dcb01074233b0a417541':
  DO NOT MERGE. Prevent recents from coming up when in SUW
This commit is contained in:
Michael Wright
2015-11-17 19:52:13 +00:00
committed by android-build-merger

View File

@@ -2720,7 +2720,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// Display task switcher for ALT-TAB. // Display task switcher for ALT-TAB.
if (down && repeatCount == 0 && keyCode == KeyEvent.KEYCODE_TAB) { if (down && repeatCount == 0 && keyCode == KeyEvent.KEYCODE_TAB) {
if (mRecentAppsHeldModifiers == 0 && !keyguardOn) { if (mRecentAppsHeldModifiers == 0 && !keyguardOn && isUserSetupComplete()) {
final int shiftlessModifiers = event.getModifiers() & ~KeyEvent.META_SHIFT_MASK; final int shiftlessModifiers = event.getModifiers() & ~KeyEvent.META_SHIFT_MASK;
if (KeyEvent.metaStateHasModifiers(shiftlessModifiers, KeyEvent.META_ALT_ON)) { if (KeyEvent.metaStateHasModifiers(shiftlessModifiers, KeyEvent.META_ALT_ON)) {
mRecentAppsHeldModifiers = shiftlessModifiers; mRecentAppsHeldModifiers = shiftlessModifiers;