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

am 4c101015: Merge "Avoid to skip app window due to un-assigned sending to bottom state while app window sort"

Browse Source 
* commit '4c1010152e487d3471e6703e8a9f8c1010488d47':
  Avoid to skip app window due to un-assigned sending to bottom state while app window sort
This commit is contained in:
Craig Mautner
2014-10-21 19:45:41 +00:00
committed by Android Git Automerger
parent 09a7d324ef 4c1010152e
commit 52656916e3
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 + "}";

6
services/java/com/android/server/wm/WindowManagerService.java
View File

@@ -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 {