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

Commit 285ccef6 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Move focus to visible behind activity when we move the home task back

Bug: 26118045
Change-Id: I106c698260b8215723ea1e50c654061464a1305f
parent 248808e3
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
@@ -3992,6 +3992,20 @@ final class ActivityStack {

        if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, "Prepare to back transition: task=" + taskId);

        if (mStackId == HOME_STACK_ID && topTask().isHomeTask()) {
            // For the case where we are moving the home task back and there is an activity visible
            // behind it on the fullscreen stack, we want to move the focus to the visible behind
            // activity to maintain order with what the user is seeing.
            final ActivityStack fullscreenStack =
                    mStackSupervisor.getStack(FULLSCREEN_WORKSPACE_STACK_ID);
            if (fullscreenStack != null && fullscreenStack.hasVisibleBehindActivity()) {
                final ActivityRecord visibleBehind = fullscreenStack.getVisibleBehindActivity();
                mService.setFocusedActivityLocked(visibleBehind, "moveTaskToBack");
                mStackSupervisor.resumeTopActivitiesLocked(fullscreenStack, null, null);
                return true;
            }
        }

        boolean prevIsHome = false;

        // If true, we should resume the home activity next if the task we are moving to the