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

Commit 99c47574 authored by Chandru S's avatar Chandru S
Browse files

Ignore scrim visibility for keeping shade window visible. 

It is hard to determine the original intent for this in shade window visibility. When camera launch from shade happens, shade window becomes visible, scrim view becomes visible and keeps shade window visible after that.

Bug: 414874982
Test: verified camera launch from expanded shade, scrim is not visible
Flag: com.android.systemui.scrim_fix
Change-Id: I733467a51eb471db37cd05d4d4e78da746e60f10
parent 0bb87e65

packages/SystemUI/aconfig/systemui.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -1467,6 +1467,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
@@ -545,10 +545,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