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

Commit d4b98705 authored by Andrii Kulian's avatar Andrii Kulian
Browse files

DO NOT MERGE -- Adjust focus when moving task back 

Resumed and focused activity should be adjusted simultaneously.
This was missing when task was moved back and focus was adjusted only
after previous activity stopped.

Bug: 31983988
Change-Id: Ie6c908b0c8c1adf94680b42ca5a8c9b01308e361
parent d35d3c98

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;

    }