summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2014-05-19 21:13:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-19 21:13:13 +0000
commit4661a2574a9936bae7207077e975ded66b91ec29 (patch)
treeade2c098ddaba7ec76e22c6dc4157ba38479bb9a /policy
parent510eb068b493b94a3fc4eef1ba33893fa2b12fa6 (diff)
parent6cb485fd2e2f8ace05e1ff281ab0fc824d3652cb (diff)
downloadframeworks_base-4661a2574a9936bae7207077e975ded66b91ec29.zip
frameworks_base-4661a2574a9936bae7207077e975ded66b91ec29.tar.gz
frameworks_base-4661a2574a9936bae7207077e975ded66b91ec29.tar.bz2
Merge "Fixing regression in dismissing Recents."
Diffstat (limited to 'policy')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindowManager.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 7c89d23..6390a69 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -2226,7 +2226,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
} else if (!down && mRecentAppsHeldModifiers != 0
&& (metaState & mRecentAppsHeldModifiers) == 0) {
mRecentAppsHeldModifiers = 0;
- hideRecentApps();
+ hideRecentApps(true);
}
// Handle keyboard language switching.
@@ -2434,12 +2434,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
}
- private void hideRecentApps() {
+ private void hideRecentApps(boolean triggeredFromAltTab) {
mPreloadedRecentApps = false; // preloading no longer needs to be canceled
try {
IStatusBarService statusbar = getStatusBarService();
if (statusbar != null) {
- statusbar.hideRecentApps();
+ statusbar.hideRecentApps(triggeredFromAltTab);
}
} catch (RemoteException e) {
Slog.e(TAG, "RemoteException when closing recent apps", e);