diff options
| -rw-r--r-- | services/java/com/android/server/wm/Task.java | 6 | ||||
| -rw-r--r-- | services/java/com/android/server/wm/WindowManagerService.java | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/services/java/com/android/server/wm/Task.java b/services/java/com/android/server/wm/Task.java index 13fdbc8..6dd89f5 100644 --- a/services/java/com/android/server/wm/Task.java +++ b/services/java/com/android/server/wm/Task.java @@ -52,6 +52,12 @@ class Task { return false; } + void setSendingToBottom(boolean toBottom) { + for (int appTokenNdx = 0; appTokenNdx < mAppTokens.size(); appTokenNdx++) { + mAppTokens.get(appTokenNdx).sendingToBottom = toBottom; + } + } + @Override public String toString() { return "{taskId=" + taskId + " appTokens=" + mAppTokens + "}"; diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index eaa237a..217fdf7 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -4806,6 +4806,9 @@ public class WindowManagerService extends IWindowManager.Stub displayContent.moveHomeStackBox(isHomeStackTask); } stack.moveTaskToTop(task); + if (mAppTransition.isTransitionSet()) { + task.setSendingToBottom(false); + } } } finally { Binder.restoreCallingIdentity(origId); @@ -4824,6 +4827,9 @@ public class WindowManagerService extends IWindowManager.Stub } final TaskStack stack = task.mStack; stack.moveTaskToBottom(task); + if (mAppTransition.isTransitionSet()) { + task.setSendingToBottom(true); + } moveStackWindowsLocked(stack.getDisplayContent()); } } finally { |