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

Commit 5dec98c5 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB] Add logs for StatusBarWindowController. 

Bug: 416703505
Flag: EXEMPT logging only change
Test: get call notification, open fullscreen app, then swipe to dismiss,
then dump new logs
Test: atest StatusBarWindowControllerImplTest

Change-Id: I73e75a277bdfe758abf56f48e776f363549d44d6
parent 072ec392

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerTest.kt

+4 −2
Original line number Diff line number Diff line
@@ -193,7 +193,8 @@ class OngoingCallControllerTest : SysuiTestCase() { 
    fun notifRepoHasOngoingCallNotif_isOngoingCallNotif_windowControllerUpdated() {

        setCallNotifOnRepo()



        verify(mockStatusBarWindowController).setOngoingProcessRequiresStatusBarVisible(true)

        verify(mockStatusBarWindowController)

            .setOngoingProcessRequiresStatusBarVisible(eq(true), any())

    }



    @Test
@@ -309,7 +310,8 @@ class OngoingCallControllerTest : SysuiTestCase() { 


        setNoNotifsOnRepo()



        verify(mockStatusBarWindowController).setOngoingProcessRequiresStatusBarVisible(false)

        verify(mockStatusBarWindowController)

            .setOngoingProcessRequiresStatusBarVisible(eq(false), any())

    }



    @Test

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

+2 −1
Original line number Diff line number Diff line
@@ -313,7 +313,8 @@ public final class ShadeControllerImpl extends BaseShadeControllerImpl { 


        // Update the visibility of notification shade and status bar window.

        mNotificationShadeWindowController.setPanelVisible(false);

        mStatusBarWindowControllerStore.getDefaultDisplay().setForceStatusBarVisible(false);

        mStatusBarWindowControllerStore.getDefaultDisplay().setForceStatusBarVisible(

                false, /* source=*/ "ShadeControllerImpl#makeExpandedInvisible");



        // Close any guts that might be visible

        mGutsManager.get().closeAndSaveGuts(

packages/SystemUI/src/com/android/systemui/statusbar/dagger/StatusBarModule.kt

+8 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.systemui.statusbar.window.SingleDisplayStatusBarWindowControl 
import com.android.systemui.statusbar.window.StatusBarWindowController

import com.android.systemui.statusbar.window.StatusBarWindowControllerImpl

import com.android.systemui.statusbar.window.StatusBarWindowControllerStore

import com.android.systemui.statusbar.window.StatusBarWindowLog

import dagger.Binds

import dagger.Lazy

import dagger.Module
@@ -167,6 +168,13 @@ interface StatusBarModule { 
            return factory.create("OngoingCall", 75)

        }



        @Provides

        @SysUISingleton

        @StatusBarWindowLog

        fun provideWindowLogBuffer(factory: LogBufferFactory): LogBuffer {

            return factory.create("StatusBarWindow", 120)

        }



        @Provides

        @SysUISingleton

        fun sysUiCutoutProvider(

packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationSchedulerImpl.kt

+9 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.provider.DeviceConfig 
import androidx.core.animation.Animator

import androidx.core.animation.AnimatorListenerAdapter

import androidx.core.animation.AnimatorSet

import com.android.app.tracing.coroutines.launchTraced as launch

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.dump.DumpManager

import com.android.systemui.statusbar.events.shared.model.SystemEventAnimationState.AnimatingIn
@@ -43,7 +44,6 @@ import kotlinx.coroutines.flow.asStateFlow 
import kotlinx.coroutines.flow.combine

import kotlinx.coroutines.flow.debounce

import kotlinx.coroutines.flow.first

import com.android.app.tracing.coroutines.launchTraced as launch

import kotlinx.coroutines.withTimeout



/**
@@ -280,7 +280,10 @@ constructor( 
    private fun runChipAppearAnimation() {

        Assert.isMainThread()

        if (hasPersistentDot) {

            statusBarWindowControllerStore.defaultDisplay.setForceStatusBarVisible(true)

            statusBarWindowControllerStore.defaultDisplay.setForceStatusBarVisible(

                true,

                source = "SystemStatusAnimSchedule#runChipAppearAnimation",

            )

        }

        _animationState.value = AnimatingIn
@@ -314,7 +317,10 @@ constructor( 
                            scheduledEvent.value != null -> AnimationQueued

                            else -> Idle

                        }

                    statusBarWindowControllerStore.defaultDisplay.setForceStatusBarVisible(false)

                    statusBarWindowControllerStore.defaultDisplay.setForceStatusBarVisible(

                        false,

                        source = "SystemStatusAnimSchedule#runChipDisappearAnimation",

                    )

                }

            }

        )

packages/SystemUI/src/com/android/systemui/statusbar/notification/headsup/StatusBarHeadsUpChangeListener.java

+6 −2
Original line number Diff line number Diff line
@@ -75,9 +75,12 @@ public class StatusBarHeadsUpChangeListener implements OnHeadsUpChangedListener, 


    @Override

    public void onHeadsUpPinnedModeChanged(boolean inPinnedMode) {

        String logString = "HeadsUpChangeListener#onHeadsUpPinnedModeChanged";

        if (inPinnedMode) {

            mNotificationShadeWindowController.setHeadsUpShowing(true);

            mStatusBarWindowControllerStore.getDefaultDisplay().setForceStatusBarVisible(true);

            mStatusBarWindowControllerStore

                    .getDefaultDisplay()

                    .setForceStatusBarVisible(true, /* source= */ logString);

            if (mPanelExpansionInteractor.isFullyCollapsed()) {

                mShadeViewController.updateTouchableRegion();

            }
@@ -94,7 +97,8 @@ public class StatusBarHeadsUpChangeListener implements OnHeadsUpChangedListener, 
                if (bypassKeyguard) {

                    mStatusBarWindowControllerStore

                            .getDefaultDisplay()

                            .setForceStatusBarVisible(false);

                            .setForceStatusBarVisible(

                                    false, /* source= */ logString);

                }

            } else {

                // we need to keep the panel open artificially, let's wait until the