Merge "Fixes dragging divider up in splitscreen puts the docked stack behind"

2017-02-22 18:53:08 +00:00
parent b0833461e4 47fa6ae96c
commit 00a3c9358b
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -2301,7 +2301,9 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
            } else {
                for (int i = 0; i < size; i++) {
                    final TaskRecord task = tasks.get(i);
-                    task.reparent(FULLSCREEN_WORKSPACE_STACK_ID, MAX_VALUE,
+                    final int position = fullscreenStack != null ?
+                            Math.max(fullscreenStack.getAllTasks().size() - 1, 0) : 0;
+                    task.reparent(FULLSCREEN_WORKSPACE_STACK_ID, position,
                            "moveTasksToFullscreenStack - NOT_onTop");
                }
            }