Merge "Make fullscreen stack visible if it has visible behind activity"
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 9e32efa..b6fc0cc 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -1359,6 +1359,13 @@
final ActivityStack focusedStack = mStackSupervisor.getFocusedStack();
final int focusedStackId = focusedStack.mStackId;
+ if (mStackId == FULLSCREEN_WORKSPACE_STACK_ID
+ && hasVisibleBehindActivity() && focusedStackId == HOME_STACK_ID) {
+ // The fullscreen stack should be visible if it has a visible behind activity behind
+ // the home stack that will be translucent.
+ return true;
+ }
+
if (mStackId == DOCKED_STACK_ID) {
// Docked stack is always visible, except in the case where the home activity
// is the top running activity in the focused home stack.