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

Commit 0a3684eb authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge "Bring home to front behind assistant stack when needed." into oc-dr1-dev

parents 4387d3a5 43f27217
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -3424,6 +3424,15 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
            return mStackSupervisor.moveHomeStackTaskToTop(reason);
        }

        if (stack.isAssistantStack() && top != null
                && top.getTask().getTaskToReturnTo() == HOME_ACTIVITY_TYPE) {
            // It is possible for the home stack to not be directly underneath the assistant stack.
            // For example, the assistant may start an activity in the fullscreen stack. Upon
            // returning to the assistant stack, we must ensure that the home stack is underneath
            // when appropriate.
            mStackSupervisor.moveHomeStackTaskToTop("adjustAssistantReturnToHome");
        }

        stack.moveToFront(myReason);
        return true;
    }