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

Merge "Set mEnterAnimationPending to true if a window was not visible" into qt-dev

Browse Source 
am: 2b188f8242

Change-Id: If1977d13505f04d448b24583f11cdec714073fde
This commit is contained in:
Tiger Huang
2019-04-12 11:05:47 -07:00
committed by android-build-merger
parent 804b8badb2 2b188f8242
commit 0eacde5a82
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -2107,7 +2107,7 @@ public class WindowManagerService extends IWindowManager.Stub
if (shouldRelayout) {
Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "relayoutWindow: viewVisibility_1");
result = win.relayoutVisibleWindow(result, attrChanges, oldVisibility);
result = win.relayoutVisibleWindow(result, attrChanges);
try {
result = createSurfaceControl(outSurfaceControl, result, win, winAnimator);

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

@@ -4446,7 +4446,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
return !mLastSurfaceInsets.equals(mAttrs.surfaceInsets);
}
int relayoutVisibleWindow(int result, int attrChanges, int oldVisibility) {
int relayoutVisibleWindow(int result, int attrChanges) {
final boolean wasVisible = isVisibleLw();
result |= (!wasVisible || !isDrawnLw()) ? RELAYOUT_RES_FIRST_TIME : 0;
@@ -4466,7 +4466,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
mDestroying = false;
mWmService.mDestroySurface.remove(this);
}
if (oldVisibility == View.GONE) {
if (!wasVisible) {
mWinAnimator.mEnterAnimationPending = true;
}