Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't display hidden activities over home screen." into klp-dev

Browse Source
This commit is contained in:
Craig Mautner
2013-09-30 18:20:48 +00:00
committed by Android (Google) Code Review
parent d6957d5f8d 19d112d836
commit 312ab4bd29
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/java/com/android/server/am/ActivityStack.java
View File

@@ -1083,10 +1083,24 @@ 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.mActivities.indexOf(r) == 0 && task.mOnTopOfHome) {
if (DEBUG_VISBILITY) Slog.v(TAG, "Showing home: at " + r);
showHomeBehindStack = true;
behindFullscreen = true;
} else if (task.mOnTopOfHome) {
// Work our way down from r to bottom of task and see if there are any
// visible activities below r.
int rIndex = task.mActivities.indexOf(r);
for ( --rIndex; rIndex >= 0; --rIndex) {
final ActivityRecord blocker = task.mActivities.get(rIndex);
if (!blocker.finishing && blocker.visible) {
if (DEBUG_VISBILITY) Slog.v(TAG, "Home visibility for " +
r + " blocked by " + blocker);
break;
}
}
if (rIndex < 0) {
// Got to task bottom without finding a visible activity, show home.
if (DEBUG_VISBILITY) Slog.v(TAG, "Showing home: at " + r);
showHomeBehindStack = true;
behindFullscreen = true;
}
}
} else {
if (DEBUG_VISBILITY) Slog.v(