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

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

Merge "Minor ktfmt fixes after recent refactor" into main

parents 87094c4d 45e76e53

packages/SystemUI/src/com/android/systemui/model/SysUIStateDispatcher.kt

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ class SysUIStateDispatcher @Inject constructor() { 


    /** Called from each [SysUiState] to propagate new state changes. */

    fun dispatchSysUIStateChange(sysUiFlags: Long, displayId: Int) {

        if (displayId != Display.DEFAULT_DISPLAY && !ShadeWindowGoesAround.isEnabled) return;

        if (displayId != Display.DEFAULT_DISPLAY && !ShadeWindowGoesAround.isEnabled) return

        listeners.forEach { listener ->

            listener.onSystemUiStateChanged(sysUiFlags = sysUiFlags, displayId = displayId)

        }

packages/SystemUI/tests/src/com/android/systemui/recents/LauncherProxyServiceTest.kt

+1 −2
Original line number Diff line number Diff line
@@ -162,8 +162,7 @@ class LauncherProxyServiceTest : SysuiTestCase() { 
        wakefulnessLifecycle.dispatchFinishedGoingToSleep()

        clearInvocations(launcherProxy)



        wakefulnessLifecycle

            .dispatchFinishedWakingUp()

        wakefulnessLifecycle.dispatchFinishedWakingUp()



        verify(launcherProxy)

            .onSystemUiStateChanged(

packages/SystemUI/tests/utils/src/com/android/systemui/model/SysUiStateKosmos.kt

+1 −6
Original line number Diff line number Diff line
@@ -32,12 +32,7 @@ val Kosmos.sysUiStateFactory by Fixture { 
    object : SysUiStateImpl.Factory {

        override fun create(displayId: Int): SysUiStateImpl {

            return spy(

                SysUiStateImpl(

                    displayId,

                    sceneContainerPlugin,

                    dumpManager,

                    sysUIStateDispatcher,

                )

                SysUiStateImpl(displayId, sceneContainerPlugin, dumpManager, sysUIStateDispatcher)

            )

        }

    }