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

Commit 156ab5c6 authored by Shawn Lee's avatar Shawn Lee Committed by Automerger Merge Worker
Browse files

Merge "Adding logging for expansion state during unlock transition" into... 

Merge "Adding logging for expansion state during unlock transition" into udc-dev am: 13cebac1 am: 6ed5cf04

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



Change-Id: Ie815ac650d66a0b43f2e7a8d4dc9c9e13bde1d0d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8630788a 6ed5cf04

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

+7 −1
Original line number Diff line number Diff line
@@ -423,12 +423,18 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
    }



    private boolean isExpanded(NotificationShadeWindowState state) {

        return !state.forceWindowCollapsed && (state.isKeyguardShowingAndNotOccluded()

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

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

                || state.headsUpNotificationShowing

                || state.scrimsVisibility != ScrimController.TRANSPARENT)

                || state.backgroundBlurRadius > 0

                || state.launchingActivityFromNotification;

        mLogger.logIsExpanded(isExpanded, state.forceWindowCollapsed,

                state.isKeyguardShowingAndNotOccluded(), state.panelVisible,

                state.keyguardFadingAway, state.bouncerShowing, state.headsUpNotificationShowing,

                state.scrimsVisibility != ScrimController.TRANSPARENT,

                state.backgroundBlurRadius > 0, state.launchingActivityFromNotification);

        return isExpanded;

    }



    private void applyFitsSystemWindows(NotificationShadeWindowState state) {

packages/SystemUI/src/com/android/systemui/shade/ShadeWindowLogger.kt

+35 −0
Original line number Diff line number Diff line
@@ -65,6 +65,41 @@ class ShadeWindowLogger @Inject constructor(@ShadeWindowLog private val buffer: 
            { "Updating visibility, should be visible : $bool1" })

    }



    fun logIsExpanded(

        isExpanded: Boolean,

        forceWindowCollapsed: Boolean,

        isKeyguardShowingAndNotOccluded: Boolean,

        panelVisible: Boolean,

        keyguardFadingAway: Boolean,

        bouncerShowing: Boolean,

        headsUpNotificationShowing: Boolean,

        scrimsVisibilityNotTransparent: Boolean,

        backgroundBlurRadius: Boolean,

        launchingActivityFromNotification: Boolean

    ) {

        buffer.log(

            TAG,

            DEBUG,

            {

                str1 = isExpanded.toString()

                bool1 = forceWindowCollapsed

                bool2 = isKeyguardShowingAndNotOccluded

                bool3 = panelVisible

                bool4 = keyguardFadingAway

                int1 = if (bouncerShowing) 1 else 0

                int2 = if (headsUpNotificationShowing) 1 else 0

                long1 = if (scrimsVisibilityNotTransparent) 1 else 0

                long2 = if (backgroundBlurRadius) 1 else 0

                double1 = if (launchingActivityFromNotification) 1.0 else 0.0

            },

            { "Setting isExpanded to $str1: forceWindowCollapsed $bool1, " +

                    "isKeyguardShowingAndNotOccluded $bool2, panelVisible $bool3, " +

                    "keyguardFadingAway $bool4, bouncerShowing $int1," +

                    "headsUpNotificationShowing $int2, scrimsVisibilityNotTransparent $long1," +

                    "backgroundBlurRadius $long2, launchingActivityFromNotification $double1"}

        )

    }



    fun logShadeVisibleAndFocusable(visible: Boolean) {

        buffer.log(

            TAG,