diff options
author | Steve Kondik <shade@chemlab.org> | 2012-05-28 15:56:57 +0400 |
---|---|---|
committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-05-28 15:56:57 +0400 |
commit | 8993448a4ac0d27f7454e829f08552ad9c90d8d3 (patch) | |
tree | a1e119e659d94dab7abc9484d44291e471cad7e4 /policy/src/com | |
parent | d21a350b4531a4f5d4782cd6ef05138e87efcebe (diff) | |
parent | 76d2ceabb551830e0c81349309e1de03b7ec7bb9 (diff) | |
download | frameworks_base-8993448a4ac0d27f7454e829f08552ad9c90d8d3.zip frameworks_base-8993448a4ac0d27f7454e829f08552ad9c90d8d3.tar.gz frameworks_base-8993448a4ac0d27f7454e829f08552ad9c90d8d3.tar.bz2 |
Merge "Change APP_SWITCH key event to open Android 4.0 recent apps switcher" into ics
Diffstat (limited to 'policy/src/com')
-rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index ff7ccf6..61c6fce 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -434,6 +434,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { boolean mHideLockScreen; boolean mDismissKeyguard; boolean mHomePressed; + boolean mAppSwitchPressed; Intent mHomeIntent; Intent mCarDockIntent; Intent mDeskDockIntent; @@ -1760,8 +1761,20 @@ public class PhoneWindowManager implements WindowManagerPolicy { } return 0; } else if (keyCode == KeyEvent.KEYCODE_APP_SWITCH) { + if (mAppSwitchPressed && !down) { + mAppSwitchPressed = false; + if (!canceled && !keyguardOn) { + sendCloseSystemWindows(SYSTEM_DIALOG_REASON_RECENT_APPS); + try { + mStatusBarService.toggleRecentApps(); + } catch (RemoteException e) { + } + } + return -1; + } + if (down && repeatCount == 0) { - showOrHideRecentAppsDialog(RECENT_APPS_BEHAVIOR_SHOW_OR_DISMISS); + mAppSwitchPressed = true; } return -1; } else if (keyCode == KeyEvent.KEYCODE_BACK) { |