diff options
| author | 2023-09-14 11:51:34 +0000 | |
|---|---|---|
| committer | 2023-09-14 11:51:34 +0000 | |
| commit | faa4e5cbe55d117c9645e5890b67d41b5df74eff (patch) | |
| tree | 6614180c7b68901615e06422b6d7e85ca0c7e308 | |
| parent | 504b6103ff221a875c6bcee60e6e6913dd4399bb (diff) | |
| parent | e41472bd05b233b5946b30b3d862f043c30f54c7 (diff) | |
Merge "Only draw legacy nav bar background when it is visible" into udc-qpr-dev am: e4ef060e1b am: e41472bd05
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24735364
Change-Id: I68e377b317d03511dae34bf2449d59ad38392c5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/com/android/internal/policy/DecorView.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java index 3e16df4d7f67..1be916f44f5b 100644 --- a/core/java/com/android/internal/policy/DecorView.java +++ b/core/java/com/android/internal/policy/DecorView.java @@ -1160,7 +1160,9 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind mForceWindowDrawsBarBackgrounds, requestedVisibleTypes); boolean oldDrawLegacy = mDrawLegacyNavigationBarBackground; mDrawLegacyNavigationBarBackground = - (mWindow.getAttributes().flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) == 0; + ((requestedVisibleTypes | mLastForceConsumingTypes) + & WindowInsets.Type.navigationBars()) != 0 + && (mWindow.getAttributes().flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) == 0; if (oldDrawLegacy != mDrawLegacyNavigationBarBackground) { mDrawLegacyNavigationBarBackgroundHandled = mWindow.onDrawLegacyNavigationBarBackgroundChanged( |