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

Merge "Remove replaced window if we aren't animating its exit." into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-10 03:31:32 +00:00
committed by Android (Google) Code Review
parent 9688c2edc9 d0a166a37d
commit c26aabadc3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1586,11 +1586,12 @@ final class WindowState implements WindowManagerPolicy.WindowState {
win.transferDimToReplacement(); win.transferDimToReplacement();
} }
win.mWillReplaceWindow = false; win.mWillReplaceWindow = false;
final boolean animateReplacingWindow = win.mAnimateReplacingWindow;
win.mAnimateReplacingWindow = false; win.mAnimateReplacingWindow = false;
win.mReplacingRemoveRequested = false; win.mReplacingRemoveRequested = false;
win.mReplacingWindow = null; win.mReplacingWindow = null;
mSkipEnterAnimationForSeamlessReplacement = false; mSkipEnterAnimationForSeamlessReplacement = false;
if (win.mAnimatingExit) { if (win.mAnimatingExit || !animateReplacingWindow) {
mService.removeWindowInnerLocked(win); mService.removeWindowInnerLocked(win);
} }
} }