Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e41472bd authored by Tiger Huang's avatar Tiger Huang Committed by Automerger Merge Worker
Browse files

Merge "Only draw legacy nav bar background when it is visible" into udc-qpr-dev am: e4ef060e 

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



Change-Id: I5028cb294379e9f478e7aeed95f9263a2fc0382a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e04c34cc e4ef060e

core/java/com/android/internal/policy/DecorView.java

+3 −1
Original line number Diff line number Diff line
@@ -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(