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

Merge "Prevent dismissing starting window when reopening app" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-11 15:20:51 +00:00
committed by Android (Google) Code Review
parent 7ac45d97cf 7c88cf8303
commit 94f7f39a01
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/AppWindowToken.java
View File

@@ -540,6 +540,14 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
// If the app was already visible, don't reset the waitingToShow state. // If the app was already visible, don't reset the waitingToShow state.
if (isHidden()) { if (isHidden()) {
waitingToShow = true; waitingToShow = true;
// Let's reset the draw state in order to prevent the starting window to be
// immediately dismissed when the app still has the surface.
forAllWindows(w -> {
if (w.mAttrs.type != TYPE_APPLICATION_STARTING) {
w.mWinAnimator.resetDrawState();
}
}, true /* traverseTopToBottom */);
} }
} }