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

Merge "ViewRootImpl: Update opaque flag if SurfaceControl changes from relayout" into sc-qpr1-dev am: 8dc8182ad0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934803

Change-Id: I066ec21a0a3874081a3aa17ea7e6a0b9f1bb0ffc
This commit is contained in:
Vishnu Nair
2021-09-28 20:54:37 +00:00
committed by Automerger Merge Worker
parent 201db897ea 8dc8182ad0
commit 9bbf9cd727
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/view/ViewRootImpl.java
View File

@@ -2836,8 +2836,13 @@ public final class ViewRootImpl implements ViewParent,
} }
} }
final boolean surfaceControlChanged =
(relayoutResult & RELAYOUT_RES_SURFACE_CHANGED)
== RELAYOUT_RES_SURFACE_CHANGED;
if (mSurfaceControl.isValid()) { if (mSurfaceControl.isValid()) {
updateOpacity(mWindowAttributes, dragResizing); updateOpacity(mWindowAttributes, dragResizing,
surfaceControlChanged /*forceUpdate */);
} }
if (DEBUG_LAYOUT) Log.v(mTag, "relayout: frame=" + frame.toShortString() if (DEBUG_LAYOUT) Log.v(mTag, "relayout: frame=" + frame.toShortString()
@@ -2872,9 +2877,7 @@ public final class ViewRootImpl implements ViewParent,
// RELAYOUT_RES_SURFACE_CHANGED since it should indicate that WMS created a new // RELAYOUT_RES_SURFACE_CHANGED since it should indicate that WMS created a new
// SurfaceControl. // SurfaceControl.
surfaceReplaced = (surfaceGenerationId != mSurface.getGenerationId() surfaceReplaced = (surfaceGenerationId != mSurface.getGenerationId()
|| (relayoutResult & RELAYOUT_RES_SURFACE_CHANGED) || surfaceControlChanged) && mSurface.isValid();
== RELAYOUT_RES_SURFACE_CHANGED)
&& mSurface.isValid();
if (surfaceReplaced) { if (surfaceReplaced) {
mSurfaceSequenceId++; mSurfaceSequenceId++;
} }
@@ -7824,7 +7827,8 @@ public final class ViewRootImpl implements ViewParent,
return relayoutResult; return relayoutResult;
} }
private void updateOpacity(WindowManager.LayoutParams params, boolean dragResizing) { private void updateOpacity(WindowManager.LayoutParams params, boolean dragResizing,
boolean forceUpdate) {
boolean opaque = false; boolean opaque = false;
if (!PixelFormat.formatHasAlpha(params.format) if (!PixelFormat.formatHasAlpha(params.format)
@@ -7840,7 +7844,7 @@ public final class ViewRootImpl implements ViewParent,
opaque = true; opaque = true;
} }
if (mIsSurfaceOpaque == opaque) { if (!forceUpdate && mIsSurfaceOpaque == opaque) {
return; return;
} }