commit c90d2b6b3d4381c119ef35e853f1204e7ebc8870
author Chong Zhang <chz@google.com> Fri Nov 13 18:48:57 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 13 18:48:57 2015 +0000
tree a2d0ab2ba36fca9bf7c95ebc28f5007dd3fc80de
parent 51c28927686ad9b52c7fcff54210d2b55ff13e34
parent b16cf34d79707f717564afb6bd4edcc3d8b118ad

Merge "Consider stack invisible if it got no running apps."

services/core/java/com/android/server/am/ActivityStack.java

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 853a55c..9896ec5 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -1338,7 +1338,12 @@
             return topHomeActivity == null || !topHomeActivity.isHomeActivity();
         }
 
-        final int belowFocusedIndex = mStacks.indexOf(focusedStack) - 1;
+        // Find the first stack below focused stack that actually got something visible.
+        int belowFocusedIndex = mStacks.indexOf(focusedStack) - 1;
+        while (belowFocusedIndex >= 0 &&
+                mStacks.get(belowFocusedIndex).topRunningActivityLocked() == null) {
+            belowFocusedIndex--;
+        }
         if ((focusedStackId == DOCKED_STACK_ID || focusedStackId == PINNED_STACK_ID)
                 && stackIndex == belowFocusedIndex) {
             // Stacks directly behind the docked or pinned stack are always visible.