summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2013-09-19 17:19:51 -0700
committerCraig Mautner <cmautner@google.com>2013-09-19 17:19:51 -0700
commitf51b5588d795ae6add9f625482d7d3f3ab34fb94 (patch)
tree6a441f5713c1915782cfa458e52f999de6c14912
parent7b3990ec81fc218f655d44624758e15ce378968e (diff)
downloadframeworks_base-f51b5588d795ae6add9f625482d7d3f3ab34fb94.zip
frameworks_base-f51b5588d795ae6add9f625482d7d3f3ab34fb94.tar.gz
frameworks_base-f51b5588d795ae6add9f625482d7d3f3ab34fb94.tar.bz2
Only show launcher for the bottom activity in a task
When transitioning from activity-over-launcher to task-over-launcher ensureActivitiesVisibleLocked() was too aggressive in showing the launcher. If there were any non-fullscreen activities in a task that sits over the launcher then the launcher would be shown. This fix adds a test to make sure the launcher will only be shown if the bottommost activity in such a task is non-fullscreen. Fixes bug 10840919. Change-Id: I5dcd63be3fa2865ae38cbb921332937dfa4b5d47
-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 c31c213..8ee4b30 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -1084,7 +1084,7 @@ final class ActivityStack {
// At this point, nothing else needs to be shown
if (DEBUG_VISBILITY) Slog.v(TAG, "Fullscreen: at " + r);
behindFullscreen = true;
- } else if (task.mOnTopOfHome) {
+ } else if (task.mActivities.indexOf(r) == 0 && task.mOnTopOfHome) {
if (DEBUG_VISBILITY) Slog.v(TAG, "Showing home: at " + r);
showHomeBehindStack = true;
behindFullscreen = true;