am 12946530: Merge "Only show launcher for the bottom activity in a task" into klp-dev

* commit '12946530cfba2024fa45c06b0060fe5c91252aab':
  Only show launcher for the bottom activity in a task
This commit is contained in:
Craig Mautner
2013-09-19 17:53:38 -07:00
committed by Android Git Automerger

View File

@@ -1083,7 +1083,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;