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

Commit 1fefc8b9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE -- Adjust focus when moving task back" into nyc-mr1-dev

parents 1553d541 d4b98705

services/core/java/com/android/server/am/ActivityStack.java

+4 −2
Original line number Diff line number Diff line
@@ -4406,7 +4406,7 @@ final class ActivityStack { 
                    mStackSupervisor.getStack(FULLSCREEN_WORKSPACE_STACK_ID);

            if (fullscreenStack != null && fullscreenStack.hasVisibleBehindActivity()) {

                final ActivityRecord visibleBehind = fullscreenStack.getVisibleBehindActivity();

                mService.setFocusedActivityLocked(visibleBehind, "moveTaskToBack");

                mService.setFocusedActivityLocked(visibleBehind, "moveHomeTaskToBack");

                mStackSupervisor.resumeFocusedStackTopActivityLocked();

                return true;

            }
@@ -4459,9 +4459,11 @@ final class ActivityStack { 
            }

            final int taskToReturnTo = tr.getTaskToReturnTo();

            tr.setTaskToReturnTo(APPLICATION_ACTIVITY_TYPE);

            return mStackSupervisor.resumeHomeStackTask(taskToReturnTo, null, "moveTaskToBack");

            return mStackSupervisor.resumeHomeStackTask(taskToReturnTo, null,

                    "moveTaskToBackAndShowHome");

        }



        adjustFocusedActivityLocked(mResumedActivity, "moveTaskToBack");

        mStackSupervisor.resumeFocusedStackTopActivityLocked();

        return true;

    }