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

Commit 788ca334 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Display home activity behind pinned activity that should return home"... 

Merge "Display home activity behind pinned activity that should return home" into nyc-dev am: 20713929
am: 7b2316fd

* commit '7b2316fd':
  Display home activity behind pinned activity that should return home
parents 6530be47 7b2316fd

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

+5 −0
Original line number Diff line number Diff line
@@ -2389,6 +2389,11 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            if (task.mActivities.size() == 1) {

                // There is only one activity in the task. So, we can just move the task over to

                // the stack without re-parenting the activity in a different task.

                if (task.getTaskToReturnTo() == HOME_ACTIVITY_TYPE) {

                    // Move the home stack forward if the task we just moved to the pinned stack

                    // was launched from home so home should be visible behind it.

                    moveHomeStackToFront(reason);

                }

                moveTaskToStackLocked(

                        task.taskId, PINNED_STACK_ID, ON_TOP, FORCE_FOCUS, reason, !ANIMATE);

            } else {