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 
am: c26aabadc3

* commit 'c26aabadc3a88af6cdfe50fa163eb48c0330c90e':
  Remove replaced window if we aren't animating its exit.

Change-Id: I160f49ab3b0bf1ea77f38a1cbc0ae493577860d4
This commit is contained in:
Wale Ogunwale
2016-05-10 03:39:38 +00:00
committed by android-build-merger
parent 17dcb56262 c26aabadc3
commit 5a8e2b210a
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.mWillReplaceWindow = false;
final boolean animateReplacingWindow = win.mAnimateReplacingWindow;
win.mAnimateReplacingWindow = false;
win.mReplacingRemoveRequested = false;
win.mReplacingWindow = null;
mSkipEnterAnimationForSeamlessReplacement = false;
if (win.mAnimatingExit) {
if (win.mAnimatingExit || !animateReplacingWindow) {
mService.removeWindowInnerLocked(win);
}
}