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

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

Merge "Let notification shade draw navigation bar background" into udc-qpr-dev am: ee1edaef 

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



Change-Id: I0eea64efdfbcb8c28424ce558827151197d7cb64
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0ce2ddb0 ee1edaef

services/core/java/com/android/server/wm/DisplayPolicy.java

+4 −1
Original line number Diff line number Diff line
@@ -2530,7 +2530,10 @@ public class DisplayPolicy { 
                mNavBarBackgroundWindowCandidate,

                mDisplayContent.mInputMethodWindow,

                mNavigationBarPosition);

        final boolean drawBackground = navBackgroundWin != null;

        final boolean drawBackground = navBackgroundWin != null

                // There is no app window showing underneath nav bar. (e.g., The screen is locked.)

                // Let system windows (ex: notification shade) draw nav bar background.

                || mNavBarBackgroundWindowCandidate == null;



        if (mNavBarOpacityMode == NAV_BAR_FORCE_TRANSPARENT) {

            if (drawBackground) {