summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Craig Mautner <cmautner@google.com> 2014-01-10 16:03:06 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2014-01-10 16:03:06 -0800
commit275817929a584b220a54b5c8206c7a7425da16d4 (patch)
tree2c4ca70ebe4bab392136533d09489b17bae4a335
parentd45a76db36854b4dc58f7c717f557311a9603f7a (diff)
parent54f991375a9c7c2a256e6aec7d4a223be8d36b39 (diff)
am 54f99137: am 3747768b: Merge "Fix visibility of multiple non-fullscreen activities."
* commit '54f991375a9c7c2a256e6aec7d4a223be8d36b39': Fix visibility of multiple non-fullscreen activities.
-rwxr-xr-x[-rw-r--r--]services/java/com/android/server/am/ActivityStack.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 37f4cd7a32af..e9c78a7a31a7 100644..100755
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -1144,7 +1144,7 @@ final class ActivityStack {
} else if (isActivityOverHome(r)) {
if (DEBUG_VISBILITY) Slog.v(TAG, "Showing home: at " + r);
showHomeBehindStack = true;
- behindFullscreen = !isHomeStack();
+ behindFullscreen = !isHomeStack() && r.frontOfTask && task.mOnTopOfHome;
}
} else {
if (DEBUG_VISBILITY) Slog.v(