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

Commit 16842cac authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Ignore scrim visibility for keeping shade window visible." into main

parents 168987a6 99c47574

packages/SystemUI/aconfig/systemui.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -1477,6 +1477,16 @@ flag { 
    bug: "370555003"

}



flag {

    name: "scrim_fix"

    namespace: "systemui"

    description: "Fix "

    bug: "414874982"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "bouncer_ui_revamp_2"

    namespace: "systemui"

packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java

+3 −1
Original line number Diff line number Diff line
@@ -543,10 +543,12 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
    }



    private boolean isExpanded(NotificationShadeWindowState state) {

        boolean areScrimsNotTransparent = state.scrimsVisibility != ScrimController.TRANSPARENT;

        boolean shouldScrimVisibilityKeepWindowVisible = !Flags.scrimFix();

        boolean isExpanded = !state.forceWindowCollapsed && (state.isKeyguardShowingAndNotOccluded()

                || state.panelVisible || state.keyguardFadingAway || state.bouncerShowing

                || state.headsUpNotificationShowing

                || state.scrimsVisibility != ScrimController.TRANSPARENT)

                || (shouldScrimVisibilityKeepWindowVisible && areScrimsNotTransparent))

                || state.launchingActivityFromNotification;



        if (Flags.instantHideShade() && state.launchingActivityFromNotification