summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/recents/Recents.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-06-17 23:30:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-17 23:30:52 +0000
commit8b9730f749498491ceb80c86261ee5b8398c7f25 (patch)
tree51599b3d1917ef44089c116419f776bb34a52513 /packages/SystemUI/src/com/android/systemui/recents/Recents.java
parent45bb0ca49a052cd6da3e4ced7709372972abdf55 (diff)
parentfe855d124b3fb3d59262b0fc6d528d91caf36951 (diff)
downloadframeworks_base-8b9730f749498491ceb80c86261ee5b8398c7f25.zip
frameworks_base-8b9730f749498491ceb80c86261ee5b8398c7f25.tar.gz
frameworks_base-8b9730f749498491ceb80c86261ee5b8398c7f25.tar.bz2
Merge "Fixing issue with recents not being hidden for translucent apps." into mnc-dev
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/recents/Recents.java')
-rw-r--r--packages/SystemUI/src/com/android/systemui/recents/Recents.java14
1 files changed, 6 insertions, 8 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/Recents.java b/packages/SystemUI/src/com/android/systemui/recents/Recents.java
index 442af90..89c456c 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/Recents.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/Recents.java
@@ -316,14 +316,12 @@ public class Recents extends SystemUI
void hideRecentsInternal(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) {
if (mBootCompleted) {
- ActivityManager.RunningTaskInfo topTask = mSystemServicesProxy.getTopMostTask();
- if (topTask != null && mSystemServicesProxy.isRecentsTopMost(topTask, null)) {
- // Notify recents to hide itself
- Intent intent = createLocalBroadcastIntent(mContext, ACTION_HIDE_RECENTS_ACTIVITY);
- intent.putExtra(EXTRA_TRIGGERED_FROM_ALT_TAB, triggeredFromAltTab);
- intent.putExtra(EXTRA_TRIGGERED_FROM_HOME_KEY, triggeredFromHomeKey);
- mContext.sendBroadcastAsUser(intent, UserHandle.CURRENT);
- }
+ // Defer to the activity to handle hiding recents, if it handles it, then it must still
+ // be visible
+ Intent intent = createLocalBroadcastIntent(mContext, ACTION_HIDE_RECENTS_ACTIVITY);
+ intent.putExtra(EXTRA_TRIGGERED_FROM_ALT_TAB, triggeredFromAltTab);
+ intent.putExtra(EXTRA_TRIGGERED_FROM_HOME_KEY, triggeredFromHomeKey);
+ mContext.sendBroadcastAsUser(intent, UserHandle.CURRENT);
}
}