Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cherry pick task movement changes from aosp" into lmp-sprout-dev

Browse Source
This commit is contained in:
Craig Mautner
2014-10-22 20:38:04 +00:00
committed by Android (Google) Code Review
parent f03ba4f13b cbd84af39a
commit 5cd68ee4df
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/Task.java
View File

@@ -60,6 +60,12 @@ class Task {
return removed; return removed;
} }
void setSendingToBottom(boolean toBottom) {
for (int appTokenNdx = 0; appTokenNdx < mAppTokens.size(); appTokenNdx++) {
mAppTokens.get(appTokenNdx).sendingToBottom = toBottom;
}
}
@Override @Override
public String toString() { public String toString() {
return "{taskId=" + taskId + " appTokens=" + mAppTokens + "}"; return "{taskId=" + taskId + " appTokens=" + mAppTokens + "}";

7
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -5058,6 +5058,10 @@ public class WindowManagerService extends IWindowManager.Stub
} }
} }
stack.moveTaskToTop(task); stack.moveTaskToTop(task);
if (mAppTransition.isTransitionSet()) {
task.setSendingToBottom(false);
}
moveStackWindowsLocked(displayContent);
} }
} finally { } finally {
Binder.restoreCallingIdentity(origId); Binder.restoreCallingIdentity(origId);
@@ -5076,6 +5080,9 @@ public class WindowManagerService extends IWindowManager.Stub
} }
final TaskStack stack = task.mStack; final TaskStack stack = task.mStack;
stack.moveTaskToBottom(task); stack.moveTaskToBottom(task);
if (mAppTransition.isTransitionSet()) {
task.setSendingToBottom(true);
}
moveStackWindowsLocked(stack.getDisplayContent()); moveStackWindowsLocked(stack.getDisplayContent());
} }
} finally { } finally {