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

Commit d992a917 authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

DO NOT MERGE -- Adjust focus when moving task back am: d4b98705 

am: 75cd6ef5

Change-Id: I07746c065e749549c7a30820f10f24945b30c760
parents 4c1d0797 75cd6ef5

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;

    }