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

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

Change-Id: Iab0e6ec103fd66b67ab903af647368cce33335eb
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:42:44 +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,
boolean force, WindowInsetsController controller) {
state.present = state.attributes.isPresent(
controller.isRequestedVisible(state.attributes.insetsType),
mWindow.getAttributes().flags, force);
(controller.isRequestedVisible(state.attributes.insetsType)
|| mLastShouldAlwaysConsumeSystemBars),
mWindow.getAttributes().flags, force);
boolean show = state.attributes.isVisible(state.present, color,
mWindow.getAttributes().flags, force);
boolean showView = show && !isResizing() && !mHasCaption && size > 0;