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

Merge "Don't set replacing flag in starting windows."

Browse Source
This commit is contained in:
Wale Ogunwale
2016-01-05 19:16:29 +00:00
committed by Android (Google) Code Review
parent 4fac768030 6d8e06bad4
commit 59dad14d9f
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -2352,10 +2352,15 @@ final class WindowState implements WindowManagerPolicy.WindowState {
}
void setReplacing(boolean animate) {
if ((mAttrs.privateFlags & PRIVATE_FLAG_WILL_NOT_REPLACE_ON_RELAUNCH) == 0) {
mWillReplaceWindow = true;
mReplacingWindow = null;
mAnimateReplacingWindow = animate;
if ((mAttrs.privateFlags & PRIVATE_FLAG_WILL_NOT_REPLACE_ON_RELAUNCH) != 0
|| mAttrs.type == TYPE_APPLICATION_STARTING) {
// We don't set replacing on starting windows since they are added by window manager and
// not the client so won't be replaced by the client.
return;
}
mWillReplaceWindow = true;
mReplacingWindow = null;
mAnimateReplacingWindow = animate;
}
}