diff options
| author | 2017-11-08 08:58:03 -0800 | |
|---|---|---|
| committer | 2017-11-08 12:32:31 -0800 | |
| commit | abc44d091ed3c919e82c8b10ef86e981e971d59b (patch) | |
| tree | 9bfaebbd2406ce88251a2dff5e50002b71879ee5 | |
| parent | 92c9a948df438748f4ea1f39011a8a182cd2a841 (diff) | |
Don't move home task forward in some cases.
Don't move the home task forward if we are starting an activity from
recent in split-screen mode since recents should still be visible in
this case.
Change-Id: I5b2e37c3644983f6feb08c09a10d15d7aa2bc45a
Fixes: 68489631
Test: go/wm-smoke
Test: Steps from bug.
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStackSupervisor.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index a0aeb6377aee..0a52ad3f5fbf 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -4489,9 +4489,12 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D "startActivityFromRecents: Task " + taskId + " not found."); } - // We always want to return to the home activity instead of the recents activity from - // whatever is started from the recents activity, so move the home stack forward. - moveHomeStackToFront("startActivityFromRecents"); + if (windowingMode != WINDOWING_MODE_SPLIT_SCREEN_PRIMARY) { + // We always want to return to the home activity instead of the recents activity + // from whatever is started from the recents activity, so move the home stack + // forward. + moveHomeStackToFront("startActivityFromRecents"); + } // If the user must confirm credentials (e.g. when first launching a work app and the // Work Challenge is present) let startActivityInPackage handle the intercepting. |