Merge "Only updateBoundsSurface when surface size has changed." into qt-dev am: fd979ca3d2

am: 71df88b5b0

Change-Id: I4aabdc78505d5da7e20ffa3ea6257aa7b5c30dac
This commit is contained in:
Chavi Weingarten
2019-06-03 09:23:01 -07:00
committed by android-build-merger

View File

@@ -2234,6 +2234,8 @@ public final class ViewRootImpl implements ViewParent,
final boolean isViewVisible = viewVisibility == View.VISIBLE;
final boolean windowRelayoutWasForced = mForceNextWindowRelayout;
boolean surfaceSizeChanged = false;
if (mFirst || windowShouldResize || insetsChanged ||
viewVisibilityChanged || params != null || mForceNextWindowRelayout) {
mForceNextWindowRelayout = false;
@@ -2312,7 +2314,7 @@ public final class ViewRootImpl implements ViewParent,
final boolean cutoutChanged = !mPendingDisplayCutout.equals(
mAttachInfo.mDisplayCutout);
final boolean outsetsChanged = !mPendingOutsets.equals(mAttachInfo.mOutsets);
final boolean surfaceSizeChanged = (relayoutResult
surfaceSizeChanged = (relayoutResult
& WindowManagerGlobal.RELAYOUT_RES_SURFACE_RESIZED) != 0;
surfaceChanged |= surfaceSizeChanged;
final boolean alwaysConsumeSystemBarsChanged =
@@ -2595,7 +2597,7 @@ public final class ViewRootImpl implements ViewParent,
maybeHandleWindowMove(frame);
}
if (surfaceChanged) {
if (surfaceSizeChanged) {
updateBoundsSurface();
}