Merge "Make sure system bars have visible background while force-showing" into tm-qpr-dev am: b11f679d66

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

Change-Id: Icbf6a52c98e8f0f6245594daee7f0502698d46f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jerry Chang
2022-07-07 02:14:42 +00:00
committed by Automerger Merge Worker

View File

@@ -1440,8 +1440,9 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
int size, boolean verticalBar, boolean seascape, int sideMargin, boolean animate, int size, boolean verticalBar, boolean seascape, int sideMargin, boolean animate,
boolean force, WindowInsetsController controller) { boolean force, WindowInsetsController controller) {
state.present = state.attributes.isPresent( state.present = state.attributes.isPresent(
controller.isRequestedVisible(state.attributes.insetsType), (controller.isRequestedVisible(state.attributes.insetsType)
mWindow.getAttributes().flags, force); || mLastShouldAlwaysConsumeSystemBars),
mWindow.getAttributes().flags, force);
boolean show = state.attributes.isVisible(state.present, color, boolean show = state.attributes.isVisible(state.present, color,
mWindow.getAttributes().flags, force); mWindow.getAttributes().flags, force);
boolean showView = show && !isResizing() && !mHasCaption && size > 0; boolean showView = show && !isResizing() && !mHasCaption && size > 0;