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

Merge "Fixed flicker when docking task from recents." into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-23 18:01:12 +00:00
committed by Android (Google) Code Review
parent 653e7bedb4 8c09c7dd7a
commit bc0a5cb2f8
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -1819,22 +1819,24 @@ final class ActivityStack {
private boolean shouldBeVisible(ActivityRecord r, boolean behindTranslucentActivity,
boolean stackVisibleBehind, ActivityRecord visibleBehind,
boolean behindFullscreenActivity) {
// mLaunchingBehind: Activities launching behind are at the back of the task stack
// but must be drawn initially for the animation as though they were visible.
final boolean activityVisibleBehind =
(behindTranslucentActivity || stackVisibleBehind) && visibleBehind == r;
if (!okToShowLocked(r)) {
return false;
}
// mLaunchingBehind: Activities launching behind are at the back of the task stack
// but must be drawn initially for the animation as though they were visible.
final boolean activityVisibleBehind =
(behindTranslucentActivity || stackVisibleBehind) && visibleBehind == r;
boolean isVisible =
!behindFullscreenActivity || r.mLaunchTaskBehind || activityVisibleBehind;
if (isVisible && r.isRecentsActivity()) {
// Recents activity can only be visible if the home stack isn't fullscreen or is the
// focused stack.
isVisible = !mFullscreen || mStackSupervisor.isFocusedStack(this);
// Recents activity can only be visible if the home stack is the focused stack or we are
// in split-screen mode.
isVisible = mStackSupervisor.getStack(DOCKED_STACK_ID) != null
|| mStackSupervisor.isFocusedStack(this);
}
return isVisible;