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

Merge "Do not gate updating allDrawn on all child WindowStates." into oc-dr1-dev am: 7968af4873

Browse Source 
am: 5623446926

Change-Id: I011d8e543245d11d530b61746513bc2bb812e6ea
This commit is contained in:
Bryce Lee
2017-07-13 02:24:53 +00:00
committed by android-build-merger
parent 69ab8acd3e 5623446926
commit f0d0b22316
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1357,8 +1357,10 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
* @return {@code true} If all children have been considered, {@code false}.
*/
private boolean allDrawnStatesConsidered() {
for (WindowState child : mChildren) {
if (!child.getDrawnStatedEvaluated()) {
for (int i = mChildren.size() - 1; i >= 0; --i) {
final WindowState child = mChildren.get(i);
if (child.mightAffectAllDrawn(false /*visibleOnly*/ )
&& !child.getDrawnStateEvaluated()) {
return false;
}
}

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

@@ -690,7 +690,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
/**
* Returns whether this {@link WindowState} has been considered for drawing by its parent.
*/
boolean getDrawnStatedEvaluated() {
boolean getDrawnStateEvaluated() {
return mDrawnStateEvaluated;
}
@@ -3392,7 +3392,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
pw.print(prefix); pw.print("mAppToken="); pw.println(mAppToken);
pw.print(prefix); pw.print(" isAnimatingWithSavedSurface()=");
pw.print(isAnimatingWithSavedSurface());
pw.print(" mAppDied=");pw.println(mAppDied);
pw.print(" mAppDied=");pw.print(mAppDied);
pw.print(prefix); pw.print("drawnStateEvaluated=");
pw.print(getDrawnStateEvaluated());
pw.print(prefix); pw.print("mightAffectAllDrawn=");
pw.println(mightAffectAllDrawn(false /*visibleOnly*/));
}
pw.print(prefix); pw.print("mViewVisibility=0x");
pw.print(Integer.toHexString(mViewVisibility));
@@ -3537,6 +3541,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
if (computeDragResizing()) {
pw.print(prefix); pw.println("computeDragResizing=" + computeDragResizing());
}
pw.print(prefix); pw.println("isOnScreen=" + isOnScreen());
pw.print(prefix); pw.println("isVisible=" + isVisible());
}
@Override