Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 342065cc authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

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

am: bc0a5cb2

* commit 'bc0a5cb2':
  Fixed flicker when docking task from recents.

Change-Id: I706798a9561613033af637473bf98b8fb72a8ca4
parents 1c49c33f bc0a5cb2
Loading
Loading
Loading
Loading
+9 −7
Original line number Diff line number Diff line
@@ -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;